From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 13 Apr 2016 10:42:37 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=112b2aaed1af10594acbcebca743223448d3cb48;p=mezzo.git

Merge branch 'dev'

Conflicts:
	app/festival/static/css/index.css
---

112b2aaed1af10594acbcebca743223448d3cb48