From: Yoan Le Clanche <yoan@ellington.pilotsystems.net>
Date: Thu, 24 May 2018 09:30:40 +0000 (+0200)
Subject: Merge branch 'dev' of git.parisson.com:git/teleforma into dev
X-Git-Tag: 1.3~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bef60e555dbffc13437110fb8d8cd2ea20e18b59;p=teleforma.git

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

bef60e555dbffc13437110fb8d8cd2ea20e18b59