]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into feature/dj1.8
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 26 Sep 2017 10:38:14 +0000 (12:38 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 26 Sep 2017 10:38:14 +0000 (12:38 +0200)

Trivial merge