projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c1b722 60c6dfd)
Merge remote-tracking branch 'origin/master' into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Wed, 4 Jan 2017 11:46:29 +0000 (12:46 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Wed, 4 Jan 2017 11:46:29 +0000 (12:46 +0100)

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