Manual merge of develop into opennebula-integration
This commit is contained in:
parent
e9646c878e
commit
cb4d96604c
3 changed files with 18 additions and 12 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'),
|
||||
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue