Merge branch 'master' into develop

* master: Fixed deploy script
2013-05-29 12:24:53 +02:00 · 2013-05-29 12:24:53 +02:00 · 13a44293e5
parent 19db8c9f7d 21624f14b8
commit 13a44293e5
1 changed files with 1 additions and 1 deletions
--- a/config/production/deploy.py
+++ b/config/production/deploy.py
@ -73,7 +73,7 @@ PREPROCESSORS = {
            ('database/static/sass/style.sass', 'database/static/css/style.css'),
        ],
        'params': '--style compressed'
-    }
+    },
    'uglify': {
        'items': [
            ('blog/static/js/load_redactor.big.js', 'blog/static/js/load_redactor.js'),