]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c14e93 9fee581)
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
authorCRI - IRCAM <cri@ircam.fr>
Thu, 29 Dec 2016 13:26:04 +0000 (14:26 +0100)
committerCRI - IRCAM <cri@ircam.fr>
Thu, 29 Dec 2016 13:26:04 +0000 (14:26 +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.