]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'master' of git.parisson.com:git/teleforma
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 3 Oct 2018 09:47:22 +0000 (11:47 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 3 Oct 2018 09:47:22 +0000 (11:47 +0200)

Trivial merge