From: Yoan Le Clanche <yoanl@pilotsystems.net>
Date: Fri, 24 Jan 2020 16:34:42 +0000 (+0100)
Subject: Merge branch 'dev' of git.parisson.com:git/teleforma into dev
X-Git-Tag: 1.4.1~5^2~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7458f4dbb47bc307cd5247db3c2a34952f7ce624;p=teleforma.git

Merge branch 'dev' of git.parisson.com:git/teleforma into dev
---

7458f4dbb47bc307cd5247db3c2a34952f7ce624