Merge branch 'release/0.8.x' into develop

2016-09-04 07:00:21 +02:00 · 2016-09-04 07:00:21 +02:00 · 5ede0f01a4
commit 5ede0f01a4
parent 0ada77d2e7 f9262e3327
13 changed files with 136 additions and 114 deletions
--- a/cms_helper.py
+++ b/cms_helper.py
@ -100,7 +100,8 @@ HELPER_SETTINGS = dict(
        'default': {
            'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
        }
-    }
+    },
+    BLOG_AUTO_SETUP=False,
 )

 try: