]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' of gitlab.com:yomguy/ircam-www into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 3 Nov 2016 22:10:39 +0000 (23:10 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 3 Nov 2016 22:10:39 +0000 (23:10 +0100)

Trivial merge