projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f78a308 e311c94)
Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorJeffrey Burdges <burdges@gnunet.org>
Sun, 4 Jun 2017 23:23:30 +0000 (01:23 +0200)
committerJeffrey Burdges <burdges@gnunet.org>
Sun, 4 Jun 2017 23:23:30 +0000 (01:23 +0200)

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