]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'dev' into feature/scores
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 28 May 2015 15:13:54 +0000 (17:13 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 28 May 2015 15:13:54 +0000 (17:13 +0200)

Trivial merge