Merge branch 'develop'

2016-05-08 18:14:51 +00:00 · 2016-05-08 18:14:51 +00:00 · 5c544e6a8d
commit 5c544e6a8d
parent 6e82b50f99 3186194b3f
49 changed files with 197 additions and 161 deletions
--- a/dynamicweb/settings/base.py
+++ b/dynamicweb/settings/base.py
@ -106,8 +106,7 @@ INSTALLED_APPS = (
 #    'ungleich_page',
    'hosting',
    'digitalglarus',
-    'django_extensions',
-    'debug_toolbar'
+
 )

 MIDDLEWARE_CLASSES = (
--- a/dynamicweb/settings/local.py
+++ b/dynamicweb/settings/local.py
@ -14,3 +14,8 @@ CACHES = {
 }

 MIDDLEWARE_CLASSES+=("debug_toolbar.middleware.DebugToolbarMiddleware",)
+
+INSTALLED_APPS+=(
+    'django_extensions',
+    'debug_toolbar'
+    )