From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 7 Feb 2018 23:27:10 +0000 (+0100)
Subject: Update admin email, ignore dirty timeside
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=05c7d78a06c825c072114ad55a5d79cee80bb32c;p=telemeta.git

Update admin email, ignore dirty timeside
---

diff --git a/.gitmodules b/.gitmodules
index 871814e3..bc3200dd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,6 +10,7 @@
 [submodule "lib/TimeSide"]
 	path = lib/TimeSide
 	url = https://github.com/Parisson/TimeSide.git
+        ignore = dirty
 [submodule "lib/timeside-diadems"]
 	path = lib/timeside-diadems
 	url = https://github.com/ANR-DIADEMS/timeside-diadems.git
diff --git a/app/settings.py b/app/settings.py
index 8c42498f..2cdd1c64 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -19,7 +19,7 @@ sys.dont_write_bytecode = True
 ALLOWED_HOSTS = ['*']
 
 ADMINS = (
-    ('Guillaume Pellerin', 'yomguy@parisson.com'),
+    ('Guillaume Pellerin', 'webmaster@parisson.com'),
 )
 
 MANAGERS = ADMINS