From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 13 Nov 2017 14:45:18 +0000 (+0100)
Subject: Merge branch 'dev' of git.parisson.com:git/teleforma into dev
X-Git-Tag: 1.2~24
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=48ca953174d9627dc6f26a4fff38b8bac3bb9a5e;p=teleforma.git

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

48ca953174d9627dc6f26a4fff38b8bac3bb9a5e