]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 29 Jun 2018 11:28:38 +0000 (13:28 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 29 Jun 2018 11:28:38 +0000 (13:28 +0200)

Trivial merge