From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Sat, 24 Mar 2018 18:24:51 +0000 (+0100)
Subject: Merge branch 'prodev' into pro
X-Git-Tag: 2.8.1-pro~195^2~1^2~10
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f92c0d4bf8b48a69a2a42cf5a5ba692cc3d5c938;p=teleforma.git

Merge branch 'prodev' into pro
---

f92c0d4bf8b48a69a2a42cf5a5ba692cc3d5c938