]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17ca8fb 8e9e11c)
Merge branch 'docker' of github.com:Parisson/Telemeta into docker
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 14 Dec 2015 00:46:12 +0000 (01:46 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 14 Dec 2015 00:46:12 +0000 (01:46 +0100)
1  2 
app/deploy/start_app.sh patch | diff1 | diff2 | blob | history

diff --cc app/deploy/start_app.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.