From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 27 Apr 2017 16:42:46 +0000 (+0200)
Subject: Merge branch 'dev' of /var/git/teleforma into dev
X-Git-Tag: 1.1~14^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e6fd026365ccb8918aacf8aaf5b2896d904fe005;p=teleforma.git

Merge branch 'dev' of /var/git/teleforma into dev
---

e6fd026365ccb8918aacf8aaf5b2896d904fe005