]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5e48f2 e1828d5)
Merge branch 'dev' into release/1.7
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 19 Oct 2017 13:13:30 +0000 (15:13 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 19 Oct 2017 13:13:30 +0000 (15:13 +0200)
1  2 
Dockerfile patch | diff1 | diff2 | blob | history

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