]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: be4d575 187eb9b)
Merge branch 'dev' into feature/eunmeration
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 24 Aug 2017 16:50:33 +0000 (18:50 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 24 Aug 2017 16:50:33 +0000 (18:50 +0200)
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.