Manual merge of ungleich/master into opennebula-integration
This commit is contained in:
parent
d10285e23d
commit
d537fcb118
227 changed files with 25686 additions and 482 deletions
|
|
@ -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"
|
||||
]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue