projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9356f42 17e755c)
Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Wed, 25 Oct 2017 20:36:10 +0000 (22:36 +0200)
committerxrs <xrs@mail36.net>
Wed, 25 Oct 2017 20:36:10 +0000 (22:36 +0200)
1  2 
AUTHORS patch | diff1 | diff2 | blob | history

diff --cc AUTHORS
Simple merge
Unnamed repository; edit this file 'description' to name the repository.