From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 27 Sep 2018 06:20:26 +0000 (+0200)
Subject: Merge branch 'master' of git.parisson.com:git/teleforma
X-Git-Tag: 1.4.1~10^2~14
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=05ec420b7eef545d55e61e96a0c5f391bf31564b;p=teleforma.git

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

05ec420b7eef545d55e61e96a0c5f391bf31564b