Merge branch 'master' into feature/ssh_keys

This commit is contained in:
Siarhei Puhach 2017-07-07 17:49:22 +03:00 committed by GitHub
commit 1279d4efbb
37 changed files with 1131 additions and 406 deletions

View file

@ -7,6 +7,14 @@ DEBUG = False
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
CACHES = {
'default': {
'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
'LOCATION': '127.0.0.1:11211',
}
}
# MANAGERS = ADMINS
REGISTRATION_MESSAGE['message'] = REGISTRATION_MESSAGE['message'].format(host='digitalglarus.ungleich.ch',