From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 13 Jul 2018 11:01:18 +0000 (+0200)
Subject: Merge branch 'dev' of git.parisson.com:git/teleforma
X-Git-Tag: 1.3.1~15
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=baf37dbddc6e350de715a34fb456d6f33efdcec9;p=teleforma.git

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

baf37dbddc6e350de715a34fb456d6f33efdcec9