From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 28 Sep 2018 08:23:52 +0000 (+0200)
Subject: Merge branch 'master' of git.parisson.com:git/teleforma
X-Git-Tag: 1.4.1~10^2~13
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9ef1778f9ff0955f6c399d9d6a7fe7e9e6e36dd7;p=teleforma.git

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

9ef1778f9ff0955f6c399d9d6a7fe7e9e6e36dd7