From: Yoan Le Clanche <yoan@ellington.pilotsystems.net>
Date: Thu, 28 Jun 2018 15:23:59 +0000 (+0200)
Subject: Merge branch 'dev' of git.parisson.com:git/teleforma into dev
X-Git-Tag: 1.3^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=abed17b52068bcf0b02b1a8a7211995b1abd251d;p=teleforma.git

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

abed17b52068bcf0b02b1a8a7211995b1abd251d