From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 26 Jan 2017 14:57:43 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d03727458a6f632050f6db6f25f4ec1476fd6c19;p=mezzo.git

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

Conflicts:
	docker-compose.yml
	lib/mezzanine-agenda
	var
---

d03727458a6f632050f6db6f25f4ec1476fd6c19