projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 315cdad 696ca66)
Merge remote-tracking branch 'origin/master' into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 18 May 2017 11:13:09 +0000 (13:13 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 18 May 2017 11:13:09 +0000 (13:13 +0200)

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