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

Merge branch 'prodev' into pro
---

effad6ea28ee936bc51e15e2cb0789f863c9d57a