projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb5a41d 31c1856)
Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Mon, 5 Mar 2018 18:40:00 +0000 (19:40 +0100)
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Mon, 5 Mar 2018 18:40:00 +0000 (19:40 +0100)

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