projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1522c35 9a558c9)
Merge branch 'master' of https://gnunet.org/git/gnunet
authorlurchi <lurchi@strangeplace.net>
Sat, 6 Jan 2018 23:59:50 +0000 (00:59 +0100)
committerlurchi <lurchi@strangeplace.net>
Sun, 7 Jan 2018 00:00:16 +0000 (01:00 +0100)

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