summaryrefslogtreecommitdiff
path: root/testapp/production.py
diff options
context:
space:
mode:
authorHardik Ghaghada2013-07-03 15:43:14 +0530
committerHardik Ghaghada2013-07-03 15:43:14 +0530
commit2ad3d7977ae9a62255901ae2133f6c3570ad3016 (patch)
tree238acfa18b3687435595d74cb222016b42e1c2c0 /testapp/production.py
parenta0ca4408b45a446e622837ef659e722ac83af149 (diff)
parentc734fe4710c6e2240f02626288fbc6b915ab29dd (diff)
downloadonline_test-2ad3d7977ae9a62255901ae2133f6c3570ad3016.tar.gz
online_test-2ad3d7977ae9a62255901ae2133f6c3570ad3016.tar.bz2
online_test-2ad3d7977ae9a62255901ae2133f6c3570ad3016.zip
Merge branch 'fresh_js_changes' of https://github.com/hardythe1/online_test into fresh_js_changes
Diffstat (limited to 'testapp/production.py')
-rw-r--r--testapp/production.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/testapp/production.py b/testapp/production.py
index 636785f..312e838 100644
--- a/testapp/production.py
+++ b/testapp/production.py
@@ -2,6 +2,7 @@ from testapp.settings import *
DEBUG=False
TEMPLATE_DEBUG=DEBUG
+from testapp.local import *
DATABASE_ENGINE = 'django.db.backends.mysql'
DATABASE_NAME = 'online_test'