projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ecfab26 68978a0)
-merge
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Thu, 7 Dec 2017 12:48:31 +0000 (13:48 +0100)
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Thu, 7 Dec 2017 12:48:31 +0000 (13:48 +0100)

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