]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' into dev
authorThomas Fillon <thomas@parisson.com>
Thu, 23 Mar 2017 14:44:44 +0000 (15:44 +0100)
committerThomas Fillon <thomas@parisson.com>
Thu, 23 Mar 2017 14:44:44 +0000 (15:44 +0100)

Trivial merge