]> 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>
Thu, 29 Sep 2016 12:29:20 +0000 (14:29 +0200)
committerJérémy Fabre <Jeremy@iMac-de-Jeremy.local>
Thu, 29 Sep 2016 12:29:20 +0000 (14:29 +0200)

Trivial merge