]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into media-list
authorEmilie <zawadzki@ircam.fr>
Sun, 9 Oct 2016 18:26:44 +0000 (20:26 +0200)
committerEmilie <zawadzki@ircam.fr>
Sun, 9 Oct 2016 18:26:44 +0000 (20:26 +0200)

Trivial merge