[GNUnet-SVN] [gnunet] 31/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 e38ec7081dfe9f915b27e1b6302f831338cc7c7d
Merge: 7399d1024 08d1fb4ad
Author: t3sserakt <address@hidden>
AuthorDate: Tue Nov 21 04:38:25 2017 +0100

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

 src/include/gnunet_protocols.h     | 10 +++--
 src/psyc/gnunet-service-psyc.c     | 72 ++++++++++++++++++++++++++-------
 src/psyc/psyc_api.c                | 82 +++++++++++++++++++++++++-------------
 src/social/gnunet-service-social.c | 36 ++++++++++++-----
 src/social/social_api.c            | 18 ++++++---
 5 files changed, 156 insertions(+), 62 deletions(-)

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