projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6380681 cde1c9f)
Merge branch 'master' of gn:gnunet
authorJulius Bünger <buenger@mytum.de>
Thu, 28 Dec 2017 23:53:32 +0000 (00:53 +0100)
committerJulius Bünger <buenger@mytum.de>
Thu, 28 Dec 2017 23:53:32 +0000 (00:53 +0100)

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