From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 29 Jun 2018 11:28:38 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.3.1~17
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=476c80d197397914f650df4b0b828821aa8343c8;p=teleforma.git

Merge branch 'dev'
---

476c80d197397914f650df4b0b828821aa8343c8