From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 1 Dec 2017 09:58:43 +0000 (+0100)
Subject: Merge branch 'prodev' into pro
X-Git-Tag: 2.8.1-pro~195^2~1^2~20
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=936417acafe12d0cb650efde777ef2316688abda;p=teleforma.git

Merge branch 'prodev' into pro
---

936417acafe12d0cb650efde777ef2316688abda