]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'dev' of git.parisson.com:git/teleforma into dev
authorYoan Le Clanche <yoan@ellington.pilotsystems.net>
Thu, 28 Jun 2018 15:23:59 +0000 (17:23 +0200)
committerYoan Le Clanche <yoan@ellington.pilotsystems.net>
Thu, 28 Jun 2018 15:23:59 +0000 (17:23 +0200)

Trivial merge