From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 18 Mar 2016 14:49:18 +0000 (+0100)
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=79f1ad016c05c9fecca5fe420d17b1f3be3c04da;p=mezzo.git

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

Conflicts:
	app/templates/agenda/event_detail.html
---

79f1ad016c05c9fecca5fe420d17b1f3be3c04da