From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 24 Sep 2020 11:50:30 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.7.4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3eddaa82d5dec986ebf8a87ba6baf8b1e4f754cb;p=telemeta.git

Merge branch 'dev'
---

3eddaa82d5dec986ebf8a87ba6baf8b1e4f754cb