]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0398119 c9808b8)
Merge remote-tracking branch 'upstream/dev' into dev
authorMathieu <mathieu.boye28@gmail.com>
Thu, 7 Apr 2016 17:20:07 +0000 (19:20 +0200)
committerMathieu <mathieu.boye28@gmail.com>
Thu, 7 Apr 2016 17:20:07 +0000 (19:20 +0200)
1  2 
app/deploy/app.sh patch | diff1 | diff2 | blob | history

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