]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb9cf30 bbe5119)
Merge remote-tracking branch 'upstream/dev' into dev
authormathieu <mathieu.boye28@gmail.com>
Fri, 10 Jun 2016 13:46:35 +0000 (15:46 +0200)
committermathieu <mathieu.boye28@gmail.com>
Fri, 10 Jun 2016 13:46:35 +0000 (15:46 +0200)

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