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

Trivial merge