From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 25 Feb 2016 12:47:43 +0000 (+0100)
Subject: Merge branch 'staging' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1eaaf998f7ec27eabef8bf3e958bc0efe8cd7671;p=mezzo.git

Merge branch 'staging' into dev

Conflicts:
	app/festival/migrations/0001_initial.py
	app/migrations/mezzanine_agenda/0002_auto_20160224_1142.py
	requirements.txt
---

1eaaf998f7ec27eabef8bf3e958bc0efe8cd7671