Merge branch 'platal-0.9.15'

Conflicts:

	configs/mails.conf

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/configs/mails.conf b/configs/mails.conf
index c3aed32..40c08c0 100644 (file)
--- a/configs/mails.conf
+++ b/configs/mails.conf
@@ -29,7 +29,7 @@ replyto=info+nlp@polytechnique.org
 
 [intervention_admin]
 from=webmaster@polytechnique.org
-to=web@polytechnique.org
+to=hotliners@staff.polytechnique.org
 
 [geoloc_error]
 from=webmaster@polytechnique.org