Merge branch 'master' of https://github.com/django-debug-toolbar/django-debug-toolbar into sql-panel-refactor

Conflicts:
	debug_toolbar/static/debug_toolbar/css/toolbar.min.css
	debug_toolbar/views.py

1 files changed, 28 insertions, 0 deletions

diff --git a/test_pgsql.py b/test_pgsql.py
new file mode 100644
index 0000000..28c0178
--- /dev/null
+++ b/test_pgsql.py
@@ -0,0 +1,28 @@
+from django.conf import global_settings
+DATABASES={
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        # Edit the below settings before use...
+        'USER': '',
+        'NAME': '',
+        'HOST': '',
+        'PASSWORD': '',
+    }
+}
+INSTALLED_APPS=[
+    'django.contrib.auth',
+    'django.contrib.admin',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.sites',
+
+    'debug_toolbar',
+
+    'tests',
+]
+MIDDLEWARE_CLASSES=global_settings.MIDDLEWARE_CLASSES + (
+    'debug_toolbar.middleware.DebugToolbarMiddleware',
+)
+ROOT_URLCONF=''
+DEBUG=False
+SITE_ID=1