From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 27 Dec 2017 16:19:37 +0000 (+0100)
Subject: Merge branch 'prodev' into pro
X-Git-Tag: 2.8.1-pro~195^2~1^2~12
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4ada1029ece8b1dbb584a0fa6d27886a3bf45ee2;p=teleforma.git

Merge branch 'prodev' into pro
---

4ada1029ece8b1dbb584a0fa6d27886a3bf45ee2