From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 10 Oct 2016 14:58:19 +0000 (+0200)
Subject: Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=57b9f611ecb8382c9737ce035275462dc22a4bc4;p=mezzo.git

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

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

57b9f611ecb8382c9737ce035275462dc22a4bc4