projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ad94d1 0120859)
Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Mon, 8 Jan 2018 06:58:36 +0000 (07:58 +0100)
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Mon, 8 Jan 2018 06:58:36 +0000 (07:58 +0100)

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