projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fad73f2 0fa8cc7)
Merge remote-tracking branch 'origin/master' into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Mon, 21 Nov 2016 19:47:10 +0000 (20:47 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Mon, 21 Nov 2016 19:47:10 +0000 (20:47 +0100)

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