Merge branch 'master' into stable/0.6.zv0.6.3stable/0.6.z

Conflicts:
	templates/mail/mail_timetable.txt

1 files changed, 1 insertions, 0 deletions

diff --git a/templates/mail/mail_timetable.txt b/templates/mail/mail_timetable.txt
index 06a2b1c..a14ce9a 100644
--- a/templates/mail/mail_timetable.txt
+++ b/templates/mail/mail_timetable.txt
@@ -2,5 +2,6 @@
 {% for course in day %}
  * {{ course.name }} ({{ course.type }}), de {{ course.begin|date:"H:i" }} à {{ course.end|date:"H:i" }}{% if course.rooms.all|length > 0 %}
    Salle{% if course.rooms.all|length > 1 %}s{% endif %} {% for room in course.rooms.all %}{{ room }} {% endfor %}{% endif %}
+
 {% endfor %}{% empty %}Aucun cours pour le groupe {{ group }} pendant la semaine {{ week }}.
 {% endfor %}{% endautoescape %}