From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 28 Jan 2019 10:49:35 +0000 (+0100)
Subject: Merge branch 'master' of git.parisson.com:git/teleforma
X-Git-Tag: 1.4.1~10^2~6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5d5fd88f6ed8ec43b932a2b777639e5c69e45fb7;p=teleforma.git

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

5d5fd88f6ed8ec43b932a2b777639e5c69e45fb7