]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'feature/html5' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 2 Jun 2017 11:22:27 +0000 (13:22 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 2 Jun 2017 11:22:27 +0000 (13:22 +0200)

Trivial merge