From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 9 Nov 2016 12:00:27 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fb4362427bf45fc82c472aebacbecdef3f67504d;p=mezzo.git

Merge branch 'dev'

Conflicts:
	app/settings.py
---

fb4362427bf45fc82c472aebacbecdef3f67504d