Merge branch 'hotfix/0.1.2' into develop

This commit is contained in:
Cesidio Di Landa 2013-04-20 10:48:22 +02:00
commit bf74fa9546
3 changed files with 6 additions and 2 deletions

View File

@ -1,6 +1,10 @@
Changelog Changelog
========= =========
0.1.2
-----
* Trying to solve assets issue on heroku
0.1.1 0.1.1
----- -----
* First hotfix * First hotfix

View File

@ -1 +1 @@
0.1.1 0.1.2

View File

@ -20,7 +20,7 @@ Starterapp::Application.configure do
# config.action_dispatch.rack_cache = true # config.action_dispatch.rack_cache = true
# Disable Rails's static asset server (Apache or nginx will already do this). # Disable Rails's static asset server (Apache or nginx will already do this).
config.serve_static_assets = false config.serve_static_assets = true
# Compress JavaScripts and CSS. # Compress JavaScripts and CSS.
config.assets.js_compressor = :uglifier config.assets.js_compressor = :uglifier