]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'master' of git.parisson.com:git/teleforma
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 12 Mar 2019 22:12:26 +0000 (23:12 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 12 Mar 2019 22:12:26 +0000 (23:12 +0100)

Trivial merge