]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d67a56b 32d054f)
Merge branch 'dev' into crem
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 13 Jan 2016 10:33:09 +0000 (11:33 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 13 Jan 2016 10:33:09 +0000 (11:33 +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.