Manual merge of develop into opennebula-integration

This commit is contained in:
M.Ravi 2017-04-26 10:40:52 +05:30
commit cb4d96604c
3 changed files with 18 additions and 12 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'),
)