projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1940b89 d3f934f)
fix merge
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Thu, 16 Aug 2018 16:53:32 +0000 (18:53 +0200)
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Thu, 16 Aug 2018 16:53:32 +0000 (18:53 +0200)

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