]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'dev' of git.parisson.com:git/teleforma into dev
authorGael Le Mignot <gael@pilotsystems.net>
Wed, 9 Jan 2019 16:59:57 +0000 (17:59 +0100)
committerGael Le Mignot <gael@pilotsystems.net>
Wed, 9 Jan 2019 16:59:57 +0000 (17:59 +0100)

Trivial merge