From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 11 Apr 2016 12:26:10 +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=07c97a2d78c6ba627894f7777b68ef2e3635eb0e;p=mezzo.git

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

Conflicts:
	app/festival/templates/festival/inc/artist_card.html
---

07c97a2d78c6ba627894f7777b68ef2e3635eb0e
diff --cc app/festival/templates/festival/inc/artist_card.html
index f485b7f7,468390eb..21c3babe
--- a/app/festival/templates/festival/inc/artist_card.html
+++ b/app/festival/templates/festival/inc/artist_card.html
@@@ -1,6 -1,4 +1,6 @@@
 +{% load i18n pages_tags mezzanine_tags %}
 +
- <div class="artist__item msry__item">
+ <div class="artist__item {% if not on_home %}msry__item {% endif %}">
      <div class="artist__item__inner">
          <a href="{% url 'festival-artist-detail' artist.slug %}" class="artist__item__inner">
              <figure class="artist__item__img">
diff --cc lib/mezzanine-agenda
index 00000000,462bf2bf..2bda2f5f
mode 000000,160000..160000
--- a/lib/mezzanine-agenda
+++ b/lib/mezzanine-agenda
@@@ -1,0 -1,1 +1,1 @@@
 -Subproject commit 462bf2bf37b7b91b0b5fff6977ca82552051034e
++Subproject commit 2bda2f5f81f289497baa321e7e607a95b26024aa