]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
authorJérémy Fabre <Jeremy@iMac-de-Jeremy.local>
Mon, 17 Oct 2016 15:26:44 +0000 (17:26 +0200)
committerJérémy Fabre <Jeremy@iMac-de-Jeremy.local>
Mon, 17 Oct 2016 15:26:44 +0000 (17:26 +0200)

Trivial merge