projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e486ed 311658e)
Merge remote-tracking branch 'origin/master' into identity_abe
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Wed, 20 Dec 2017 09:05:45 +0000 (10:05 +0100)
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Wed, 20 Dec 2017 09:05:45 +0000 (10:05 +0100)

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