Manual merge of ungleich/master into opennebula-integration

This commit is contained in:
M.Ravi 2017-04-24 03:01:05 +05:30
commit d537fcb118
227 changed files with 25686 additions and 482 deletions

View file

@ -2,6 +2,7 @@ from .base import *
ADMINS = (
('Nico Schottelius', 'nico.schottelius@ungleich.ch'),
('Raul Ascencio', 'raul.ascencio@yandex.com'),
('Tomislav Rupcic','tmslav@gmail.com'),
)
@ -16,5 +17,6 @@ REGISTRATION_MESSAGE['message'] = REGISTRATION_MESSAGE['message'].format(host='d
ALLOWED_HOSTS = [
".ungleich.ch",
"digital.glarus.ungleich.ch" ,
"digital.glarus.ungleich.ch",
".alplora.ch"
]