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

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

e05266c5a8e310ddb063b63e0862b3b25f4921b7