resolve base.py conflict

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

View file

@ -8,6 +8,8 @@ ADMINS = (
MANAGERS = ADMINS
REGISTRATION_MESSAGE['message'] = REGISTRATION_MESSAGE['message'].format(host='digitalglarus.ungleich.ch',slug='{slug}')
ALLOWED_HOSTS = [
".ungleich.ch",
"digital.glarus.ungleich.ch" ,