]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 8 Apr 2016 16:24:25 +0000 (18:24 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 8 Apr 2016 16:24:25 +0000 (18:24 +0200)
Conflicts:
app/festival/templates/festival/artist_detail.html

1  2 
app/festival/templates/festival/artist_detail.html

index 427c6613777fc7cddbefae153e925b6cfe30d59f,22ccc9f17d72086982f0cbce602d6781a3502fcd..1a564b2801b33b0ea8fd3553fd631ea91c4ee4b2
@@@ -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 %}