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

Merge branch 'dev'

Conflicts:
	app/settings.py
---

9c7c05bf456866b0cea12a71f310991d10cf2bcd