]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'feature/html5' of github.com:Parisson/telemeta into feature/html5
authorThomas Fillon <thomas@parisson.com>
Tue, 4 Apr 2017 22:44:58 +0000 (00:44 +0200)
committerThomas Fillon <thomas@parisson.com>
Tue, 4 Apr 2017 22:44:58 +0000 (00:44 +0200)

Trivial merge