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

Merge branch 'prodev' into pro
---

c73fbef6c5b12196fde2815fe282842fc400d217