consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes conflicts with master

Browse Source
This commit is contained in:
rgarcia
2016-07-19 15:50:22 +02:00
parent 075c6c24b9 24a9d77e64
commit a23666683f
18 changed files with 317 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/initializers/assets.rb
View File

@@ -14,3 +14,7 @@ Rails.application.config.assets.precompile += %w( ie_lt9.js )
Rails.application.config.assets.precompile += %w( stat_graphs.js )
Rails.application.config.assets.precompile += %w( print.css )
Rails.application.config.assets.precompile += %w( ie.css )
# Loads app/assets/images/custom before app/assets/images
images_path = Rails.application.config.assets.paths
images_path = images_path.insert(0, Rails.root.join("app", "assets", "images", "custom").to_s)