projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4f6c5a 78705d5)
Merge remote-tracking branch 'origin/identity_abe'
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Thu, 4 Jan 2018 15:07:55 +0000 (16:07 +0100)
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Thu, 4 Jan 2018 15:07:55 +0000 (16:07 +0100)

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