Update admin email, ignore dirty timeside

diff --git a/.gitmodules b/.gitmodules
index 871814e3f1b059c9905c5aabcae4341ca51062d2..bc3200ddcd2f587db39f1b0cbe6f4b24e6b1f45a 100644 (file)
--- 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 8c42498fcd6dc440f513f9b2d5575fee3acc08e5..2cdd1c64ce41bb0fc15a600f14762e299520235b 100644 (file)
--- 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