Merge branch 'master' of sublab.org:subweb

Conflicts:
	requirements.txt

1 files changed, 10 insertions, 1 deletions

diff --git a/conf/dev_settings.py b/conf/dev_settings.py
index b61a979..1953653 100644
--- a/conf/dev_settings.py
+++ b/conf/dev_settings.py
@@ -1,6 +1,6 @@
 import os
 
-from settings import SITE_ROOT
+from settings import SITE_ROOT, INSTALLED_APPS, MIDDLEWARE_CLASSES
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
@@ -11,3 +11,12 @@ DATABASES = {
         'NAME': os.path.join(SITE_ROOT, 'sublab.db'),
     }
 }
+
+INSTALLED_APPS += ('debug_toolbar',)
+MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
+
+INTERNAL_IPS = ('127.0.0.1')
+
+DEBUG_TOOLBAR_CONFIG = {
+        'INTERCEPT_REDIRECTS': False,
+}