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

Trivial merge