]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' into dev
authorThomas Fillon <thomas@parisson.com>
Wed, 4 Oct 2017 07:18:17 +0000 (09:18 +0200)
committerThomas Fillon <thomas@parisson.com>
Wed, 4 Oct 2017 07:18:17 +0000 (09:18 +0200)

Trivial merge