From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 8 Apr 2016 16:24:25 +0000 (+0200)
Subject: Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b7a67a89e123ef36ccec79ec3b5c36ae156c762b;p=mezzo.git

Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev

Conflicts:
	app/festival/templates/festival/artist_detail.html
---

b7a67a89e123ef36ccec79ec3b5c36ae156c762b
diff --cc app/festival/templates/festival/artist_detail.html
index 427c6613,22ccc9f1..1a564b28
--- a/app/festival/templates/festival/artist_detail.html
+++ b/app/festival/templates/festival/artist_detail.html
@@@ -22,7 -22,8 +22,8 @@@
      </p>
  </div>
  
- <h2 class="section__title">{% trans "Also to discover" %}</h2> <br>
+ <hr style="margin-top: 3rem;">
 -<h2 class="section__title">{% trans "Related events" %}</h2> <br>
++<h2 class="section__title">{% trans "Also discover" %}</h2> <br>
  {% for event in artist.events.all %}
   {% include 'agenda/includes/event_card.html' %}
  {% endfor %}