projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ada1ee7 48fc709)
Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Fri, 5 Jan 2018 14:37:00 +0000 (15:37 +0100)
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Fri, 5 Jan 2018 14:37:00 +0000 (15:37 +0100)

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