From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 29 Jun 2018 08:57:45 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.3.1~16^2^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=cf505406b065baa46e77256b29f3c3e84a66f935;p=teleforma.git

Merge branch 'dev'
---

cf505406b065baa46e77256b29f3c3e84a66f935