[GNUnet-SVN] [gnunet] 28/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 7399d102457a822d09b96638aaea883359aafafa
Merge: d2fad46f2 6599b4d49
Author: t3sserakt <address@hidden>
AuthorDate: Tue Nov 14 13:19:39 2017 +0100

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

 src/social/gnunet-service-social.c | 406 ++++++++++++++-----------------------
 src/social/social_api.c            | 113 +----------
 2 files changed, 156 insertions(+), 363 deletions(-)

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