From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 5 Jul 2018 15:18:45 +0000 (+0200)
Subject: Merge branch 'master' of git.parisson.com:git/teleforma
X-Git-Tag: 1.3.1~16
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=165bcba362a138c4399289ade830590d374d4e81;p=teleforma.git

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

165bcba362a138c4399289ade830590d374d4e81