projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ca96c1 b829c58)
Merge branch 'fix_social' of ssh://gnunet.org/gnunet into fix_social
authorlurchi <lurchi@strangeplace.net>
Fri, 13 Oct 2017 20:18:43 +0000 (22:18 +0200)
committerlurchi <lurchi@strangeplace.net>
Fri, 13 Oct 2017 20:19:17 +0000 (22:19 +0200)

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