]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2eb8ece 7ed9fa4)
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 8 Jul 2016 15:01:20 +0000 (17:01 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 8 Jul 2016 15:01:20 +0000 (17:01 +0200)
Conflicts:
docker-compose.yml


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.