Merge branch 'master' into dev

This commit is contained in:
Benjamin Dauvergne 2011-10-18 21:26:59 +02:00
commit 95bd69bacc
2 changed files with 2 additions and 2 deletions

View File

@ -6,7 +6,7 @@ DEBUG = True
TEMPLATE_DEBUG = DEBUG
ADMINS = (
('Benjamin Dauvergne', 'bdauvergne@entrouvert.com'),
('Entrouvert Admin', 'admin@entrouvert.com'),
)
INTERNAL_IPS = ( '127.0.0.1', '82.234.244.169' )

View File

@ -6,7 +6,7 @@ DEBUG = False
TEMPLATE_DEBUG = DEBUG
ADMINS = (
('Benjamin Dauvergne', 'bdauvergne@entrouvert.com'),
('Entrouvert Admin', 'admin@entrouvert.com'),
)
MANAGERS = ADMINS