]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'dev' of git.parisson.com:git/teleforma
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 17 Jun 2020 15:34:59 +0000 (17:34 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 17 Jun 2020 15:34:59 +0000 (17:34 +0200)

Trivial merge