diff options
author | Prabhu Ramachandran | 2013-04-27 15:28:28 +0530 |
---|---|---|
committer | Prabhu Ramachandran | 2013-04-27 15:28:28 +0530 |
commit | 8b6ac259503323bc3d8333382d3769e5d10f162a (patch) | |
tree | 5d260a3db043492ef731b4241cf0f07563591743 /production.cfg | |
parent | fd044e4a9f08366c9425cb241b7452da2ba904e1 (diff) | |
parent | 5c7f66806e4be50985655b7c12bf3190ee91ae46 (diff) | |
download | online_test-8b6ac259503323bc3d8333382d3769e5d10f162a.tar.gz online_test-8b6ac259503323bc3d8333382d3769e5d10f162a.tar.bz2 online_test-8b6ac259503323bc3d8333382d3769e5d10f162a.zip |
Merge branch 'model_changes' of ...
https://github.com/hardythe1/online_test into master.
Conflicts:
production.cfg
testapp/production.py
Diffstat (limited to 'production.cfg')
-rw-r--r-- | production.cfg | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/production.cfg b/production.cfg index 0e84b67..318fb12 100644 --- a/production.cfg +++ b/production.cfg @@ -3,9 +3,12 @@ parts = django eggs = South - MySQL-python + psycopg2 + django-taggit + django-taggit-autocomplete-modified + django-debug-toolbar -versions=versions +versions = versions [versions] django = 1.3 |