From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 1 Jul 2020 09:27:31 +0000 (+0200)
Subject: Merge branch 'dev' of https://github.com/Parisson/Telemeta into dev
X-Git-Tag: 1.7.4~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=046340fbee9ae82f4adbcf70e38421d309740ede;p=telemeta.git

Merge branch 'dev' of https://github.com/Parisson/Telemeta into dev
---

046340fbee9ae82f4adbcf70e38421d309740ede