Merge remote-tracking branch 'origin/feature-postgres' into develop

This commit is contained in:
Jan Tuomi
2017-05-10 19:37:18 +03:00
8 changed files with 38 additions and 41 deletions
+2 -2
View File
@@ -97,12 +97,12 @@ WSGI_APPLICATION = 'sikweb.wsgi.application'
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.mysql',
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'sik',
'USER': 'sik',
'PASSWORD': 'password123',
'HOST': 'db',
'PORT': '3306',
'PORT': '5432',
'TEST': {
'NAME': 'sik_test',
},