From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 18 Oct 2016 15:43:53 +0000 (+0200)
Subject: Merge branch 'dev' into prestashop
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ac8fbfd4e03ecc6d179aea8fc04910fb207cc72f;p=mezzo.git

Merge branch 'dev' into prestashop

Conflicts:
	app/templates/agenda/includes/event_date.html
---

ac8fbfd4e03ecc6d179aea8fc04910fb207cc72f