From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 12 Nov 2018 10:49:33 +0000 (+0100)
Subject: Merge branch 'master' of git.parisson.com:git/teleforma
X-Git-Tag: 1.4.1~10^2~8
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=42d843af07a8ecce88ddf2c5fc55a91a2c6b6d5c;p=teleforma.git

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

42d843af07a8ecce88ddf2c5fc55a91a2c6b6d5c