]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'dev' of git.parisson.com:git/teleforma into dev
authorYoan Le Clanche <yoanl@pilotsystems.net>
Fri, 24 Jan 2020 16:34:42 +0000 (17:34 +0100)
committerYoan Le Clanche <yoanl@pilotsystems.net>
Fri, 24 Jan 2020 16:34:42 +0000 (17:34 +0100)

Trivial merge