[GNUnet-SVN] [gnunet] 25/64: Merge branch 'fix_social' of gnunet.org:gnunet into fix_social

[gnunet]

This is an automated email from the git hooks/post-receive script.

lurchi pushed a commit to branch master
in repository gnunet.

commit d2fad46f215da13dcd87206afa739da2ec623a91
Merge: 12997f914 2b9f858b1
Author: t3sserakt <address@hidden>
AuthorDate: Thu Nov 9 20:35:41 2017 +0100

    Merge branch 'fix_social' of gnunet.org:gnunet into fix_social

 src/include/gnunet_protocols.h     |  23 ++---
 src/social/gnunet-service-social.c |   9 +-
 src/social/social_api.c            | 169 ++++++++++++++++++++++---------------
 3 files changed, 118 insertions(+), 83 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
address@hidden