Merge branch 'master' into feature/notifybymail

This commit is contained in:
Nico Schottelius 2015-08-09 22:15:29 +02:00
commit 51a398927f
6 changed files with 14 additions and 247 deletions

View file

@ -43,7 +43,11 @@ DEBUG = False
ALLOWED_HOSTS = [
".ungleich.ch",
"digital.glarus.ungleich.ch" ]
"digital.glarus.ungleich.ch" ,
"rails-hosting.ch",
"django-hosting.ch",
"node-hosting.ch"
]
# Application definition