]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8fb536d 4184ed3)
Merge branch 'docker' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 15 Dec 2015 22:08:46 +0000 (23:08 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 15 Dec 2015 22:08:46 +0000 (23:08 +0100)
Conflicts:
examples/deploy/start_app.sh


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.