]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of https://github.com/Parisson/Telemeta into dev
authorThomas Fillon <thomas@parisson.com>
Fri, 2 Jun 2017 11:37:37 +0000 (13:37 +0200)
committerThomas Fillon <thomas@parisson.com>
Fri, 2 Jun 2017 11:37:37 +0000 (13:37 +0200)

Trivial merge