From: Arnaud Delcasse <arnaud@delcasse.fr>
Date: Sat, 18 Aug 2012 16:53:27 +0000 (+0200)
Subject: Merge branch 'master' of git.ndn.cx:cavote
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dcompta/operations/?a=commitdiff_plain;h=a088209db173fc2bc6017dc77e6dbbf3b10830aa;hp=353901f0dc3ed18fbef417766b2a3ad46282a504;p=cavote.git

Merge branch 'master' of git.ndn.cx:cavote
---

diff --git a/main.py b/main.py
index 21a7500..3fcc5ae 100755
--- a/main.py
+++ b/main.py
@@ -135,7 +135,7 @@ def password_lost():
                 link,
                 "",
                 "If you think this mail is not for you, please ignore and delete it."
-                ), "\r\n")
+                ), "\n")
             server = smtplib.SMTP(SMTP_SERVER)
             server.sendmail(EMAIL, [user['email']], BODY)
             server.quit()
@@ -264,7 +264,7 @@ def admin_user_add():
                             "To log in for the first time and set your password, please follow this link :",
                             link,
                             ""
-                            ), "\r\n")
+                            ), "\n")
                             server = smtplib.SMTP(SMTP_SERVER)
                             server.sendmail(EMAIL, [user['email']], BODY)
                             server.quit()