]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'dev' of git.parisson.com:git/teleforma
authorGuillaume Pellerin <yomguy@parisson.com>
Sun, 20 Jan 2019 20:34:13 +0000 (21:34 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Sun, 20 Jan 2019 20:34:13 +0000 (21:34 +0100)

Trivial merge