projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b30b04c 06ee3c3)
Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorChristian Grothoff <christian@grothoff.org>
Fri, 29 Jun 2018 14:09:49 +0000 (16:09 +0200)
committerChristian Grothoff <christian@grothoff.org>
Fri, 29 Jun 2018 14:09:49 +0000 (16:09 +0200)

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