projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f726a9 b9e4bb7)
Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Sat, 23 Jun 2018 14:42:46 +0000 (16:42 +0200)
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Sat, 23 Jun 2018 14:42:46 +0000 (16:42 +0200)

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