From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 2 Jun 2017 11:22:27 +0000 (+0200)
Subject: Merge branch 'feature/html5' into dev
X-Git-Tag: search~2^2~19
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c10c1c3240d80138b617fd7d75bdfba334d1a786;p=telemeta.git

Merge branch 'feature/html5' into dev
---

c10c1c3240d80138b617fd7d75bdfba334d1a786