]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 90f1b96 c78c2f1)
Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 18 Dec 2017 10:07:50 +0000 (11:07 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 18 Dec 2017 10:07:50 +0000 (11:07 +0100)
1  2 
docker-compose.yml patch | diff1 | diff2 | blob | history

diff --cc docker-compose.yml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.