repaired celery, c2 error, finish merge

2017-02-13 16:20:11 +01:00
parent bb7652522e
commit 19037a9a81
6 changed files with 67 additions and 19 deletions
--- a/rowsandall_app/settings_dev.py
+++ b/rowsandall_app/settings_dev.py
@@ -14,7 +14,9 @@ from settings import *
 DATABASES = {
    'default': {
        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),},
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+        'HOST': 'localhost'
+    },
 #    'TEST': {
 #	'CHARSET': 'utf8',
 #	'COLLATION': 'utf8_general_ci',