update
This commit is contained in:
parent
b498b253f7
commit
a14c028f61
@ -1,6 +1,6 @@
|
||||
GIT
|
||||
remote: https://github.com/HubFeenixMakers/merged
|
||||
revision: 3a15e58ee38dae847ff877c261ce9856e00c74fb
|
||||
revision: ee94e687f93cd317df6829e7ce2393b3451044b5
|
||||
specs:
|
||||
merged (0.1.0)
|
||||
active_hash
|
||||
@ -319,7 +319,7 @@ GEM
|
||||
rb-inotify (0.10.1)
|
||||
ffi (~> 1.0)
|
||||
rchardet (1.8.0)
|
||||
redcarpet (3.5.1)
|
||||
redcarpet (3.6.0)
|
||||
regexp_parser (2.1.1)
|
||||
reline (0.3.2)
|
||||
io-console (~> 0.5)
|
||||
@ -401,7 +401,7 @@ GEM
|
||||
tilt (2.0.11)
|
||||
timeago_js (3.0.2.2)
|
||||
timeout (0.3.1)
|
||||
tzinfo (2.0.5)
|
||||
tzinfo (2.0.6)
|
||||
concurrent-ruby (~> 1.0)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
|
@ -1,8 +1,6 @@
|
||||
require "merged"
|
||||
|
||||
# directory inside /app/assets/images where YOUR images are kept
|
||||
# if you change this and add own styles, you will still need a merged directory
|
||||
# for the previews (card_preview and section_preview)
|
||||
# directory inside /app/assets/images where the images are kept
|
||||
Merged.images_dir = "merged"
|
||||
|
||||
# directory where data and styles are kept
|
||||
|
Loading…
Reference in New Issue
Block a user