]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'master' of git.parisson.com:git/teleforma
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 28 Jan 2019 10:49:35 +0000 (11:49 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 28 Jan 2019 10:49:35 +0000 (11:49 +0100)

Trivial merge