# HG changeset patch
# User rougeronj
# Date 1425918890 -3600
# Node ID 0d7fd89104d918b66363854639501b1c20118294
# Parent  9dc050cf904b4d27fe8f49c932e31cee30721d28# Parent  808656a8323c782d800266129f0dd12bf4290a72
Merge with 808656a8323c782d800266129f0dd12bf4290a72

diff -r 9dc050cf904b -r 0d7fd89104d9 .hgtags
--- a/.hgtags	Mon Mar 09 17:31:40 2015 +0100
+++ b/.hgtags	Mon Mar 09 17:34:50 2015 +0100
@@ -110,3 +110,4 @@
 6c6ba670b985deba09f84672be84b8e5aff8f306 V03.00-rc.01
 6c6ba670b985deba09f84672be84b8e5aff8f306 V03.00-rc.01
 c86417bff0bb71875d2160fbf653c8b0da55fe5e V03.00-rc.01
+c141b3a71f26d30318f0a6f31d9d190d24a43748 V03.00-rc.02
diff -r 9dc050cf904b -r 0d7fd89104d9 src/hdalab/__init__.py
--- a/src/hdalab/__init__.py	Mon Mar 09 17:31:40 2015 +0100
+++ b/src/hdalab/__init__.py	Mon Mar 09 17:34:50 2015 +0100
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
 
-VERSION = (3, 0, 0, "rc", 1)
+VERSION = (3, 0, 0, "rc", 2)
 
 
 def get_version():
diff -r 9dc050cf904b -r 0d7fd89104d9 src/hdalab/locale/en/LC_MESSAGES/django.mo
Binary file src/hdalab/locale/en/LC_MESSAGES/django.mo has changed
diff -r 9dc050cf904b -r 0d7fd89104d9 src/hdalab/locale/en/LC_MESSAGES/django.po
--- a/src/hdalab/locale/en/LC_MESSAGES/django.po	Mon Mar 09 17:31:40 2015 +0100
+++ b/src/hdalab/locale/en/LC_MESSAGES/django.po	Mon Mar 09 17:34:50 2015 +0100
@@ -388,7 +388,7 @@
 
 #: templates/index.html:59
 msgid "Navigation <strong>à travers les Arts</strong> "
-msgstr "~Navigation through the Arts"
+msgstr "Navigation through the Arts"
 
 #: templates/index.html:62
 msgid ""
diff -r 9dc050cf904b -r 0d7fd89104d9 src/hdalab/templates/mails/published_renkan.txt
--- a/src/hdalab/templates/mails/published_renkan.txt	Mon Mar 09 17:31:40 2015 +0100
+++ b/src/hdalab/templates/mails/published_renkan.txt	Mon Mar 09 17:34:50 2015 +0100
@@ -3,7 +3,6 @@
 Votre Renkan intitulé "{{ renkan_state.renkan.renkan.title}}" a été publié.
 Vous pouvez le retrouver à l'url suivante: {{WEB_URL}}{% url 'renkan_view' %}?rk_id={{ renkan_state.renkan.renkan.rk_id }}
 
-                        <br>
-                        <p>Cordialement,</p>
-                        <br>
-                        <p>L'équipe Hdalab.</p>
+Cordialement,
+
+L'équipe Hdalab.