projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2218ab5 929df26)
Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Mon, 25 Jun 2018 14:22:49 +0000 (16:22 +0200)
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Mon, 25 Jun 2018 14:22:49 +0000 (16:22 +0200)

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