projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea5102e 7c1ce9a)
Merge branch 'fix_social' of gnunet.org:gnunet into fix_social
authort3sserakt <t3ss@posteo.de>
Thu, 2 Nov 2017 17:15:13 +0000 (18:15 +0100)
committert3sserakt <t3ss@posteo.de>
Thu, 2 Nov 2017 17:15:13 +0000 (18:15 +0100)
1  2 
src/util/client.c patch | diff1 | diff2 | blob | history

diff --cc src/util/client.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.