From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 28 Jun 2018 22:28:26 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d419d272dc36775ca98f37b20d1d8350d586179a;p=teleforma.git

Merge branch 'dev'
---

d419d272dc36775ca98f37b20d1d8350d586179a