projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b6f6c0 f88d55e)
Merge remote-tracking branch 'origin/master' into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Fri, 2 Dec 2016 14:14:11 +0000 (15:14 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Fri, 2 Dec 2016 14:14:11 +0000 (15:14 +0100)

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