From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 28 May 2015 15:13:54 +0000 (+0200)
Subject: Merge branch 'dev' into feature/scores
X-Git-Tag: 1.1~232^2~7
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6f6068fc28ef5cbf2615a011ab97ab7ab83c2120;p=teleforma.git

Merge branch 'dev' into feature/scores
---

6f6068fc28ef5cbf2615a011ab97ab7ab83c2120