moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

resolve base.py conflict

Browse source
This commit is contained in:
Tomislav R 2016-05-07 23:05:46 +02:00
commit fbbee2839c
6 changed files with 98 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dynamicweb/settings/local.py
View file

@ -1,15 +1,9 @@
from .base import *
REGISTRATION_MESSAGE['message'] = REGISTRATION_MESSAGE['message'].format(host='dynamicweb-development.ungleich.ch',slug='{slug}')
ALLOWED_HOSTS = [
"*"
]
# DATABASES = {
# 'default': {
# 'ENGINE': 'django.db.backends.sqlite3',
# 'NAME': 'app.db',
# }
# }
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
CACHES = {