From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 26 Dec 2018 11:19:41 +0000 (+0100)
Subject: Merge branch 'prodev' into pro
X-Git-Tag: 2.8.1-pro~195^2~1^2~7
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3c988e3167236463d138a1b1e0514820aafc9b56;p=teleforma.git

Merge branch 'prodev' into pro
---

3c988e3167236463d138a1b1e0514820aafc9b56