From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 1 Nov 2018 17:56:41 +0000 (+0100)
Subject: Merge branch 'master' of git.parisson.com:git/teleforma
X-Git-Tag: 1.4.1~10^2~9
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=75a4a72fd9e4071aec71913b8c0b3200c232ad8c;p=teleforma.git

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

75a4a72fd9e4071aec71913b8c0b3200c232ad8c