Merge remote-tracking branch 'openstreetmap/pull/1082'

[rails.git] / config / initializers / assets.rb

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index bb647b6a75c5c134f4796eae2df59945d9b693e7..7baac7f789310d9c2802c9d8e33e3f2a9a429c5e 100644 (file)
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -7,7 +7,7 @@ Rails.application.config.assets.version = "1.0"
 Rails.application.config.assets.manifest = Rails.root.join("tmp/manifest.json")
 
 # Add additional assets to the asset load path
-# Rails.application.config.assets.paths << Emoji.images_path
+Rails.application.config.assets.paths << Rails.root.join("config")
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.