projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6e0922f 513c56d)
Merge remote-tracking branch 'origin/master' into identity_abe
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Tue, 5 Dec 2017 16:27:33 +0000 (17:27 +0100)
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Tue, 5 Dec 2017 16:27:33 +0000 (17:27 +0100)

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