Merge branch 'master' into development

Conflicts: apps/main/__init__.py
2011-12-05 22:47:58 -04:00
parent 5ec7898c55 fff202e5b4
commit 7d604322ac
3 changed files with 4 additions and 1 deletions
--- a/apps/main/init.py
+++ b/apps/main/init.py
@@ -21,7 +21,7 @@ __version_info__ = {
    'minor': 10,
    'micro': 0,
    'releaselevel': 'hotfix',
-    'serial': 2
+    'serial': 4
 }

 def is_superuser(context):
--- a/settings.py
+++ b/settings.py
@@ -187,6 +187,8 @@ STATICFILES_FINDERS = (
 COMPRESS_PARSER = 'compressor.parser.HtmlParser'
 COMPRESS_CSS_FILTERS = ['compressor.filters.css_default.CssAbsoluteFilter', 'compressor.filters.cssmin.CSSMinFilter']

+COMPRESS_ENABLED=False
+
 #===== User configuration options ===============
 #--------- Pagination ------------------
 #PAGINATION_DEFAULT_PAGINATION = 10
--- a/static/CACHE/empty.txt
+++ b/static/CACHE/empty.txt
@@ -0,0 +1 @@
+empty file