From: Yoan Le Clanche <yoan@ellington.pilotsystems.net>
Date: Wed, 7 Mar 2018 11:46:29 +0000 (+0100)
Subject: Merge branch 'dev' of git.parisson.com:git/teleforma into dev
X-Git-Tag: 1.2~4^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=12952573093e0bea8d9a2c1e3d1cc423771d4e35;p=teleforma.git

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

12952573093e0bea8d9a2c1e3d1cc423771d4e35