Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Tomislav R 2016-04-09 09:57:56 +02:00
commit ec12689904

View file

@ -1,9 +1,10 @@
from .base import * from .base import *
DEBUG = False DEBUG = True
ADMINS = ( ADMINS = (
('Nico Schottelius', 'nico.schottelius@ungleich.ch'), ('Nico Schottelius', 'nico.schottelius@ungleich.ch'),
('Raul Ascencio', 'raul.ascencio@yandex.com'),
) )
# ('Sanghee Kim', 'sanghee.kim@ungleich.ch'), # ('Sanghee Kim', 'sanghee.kim@ungleich.ch'),