[GNUnet-SVN] [gnunet] 11/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 ea5102e5ef870b7ed90aebfe44a4caa1148d57df
Merge: 2eb28778d e429bb239
Author: t3sserakt <address@hidden>
AuthorDate: Sun Oct 29 02:48:26 2017 +0100

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

 src/social/gnunet-service-social.c |  30 +++++----
 src/social/social_api.c            | 132 +++++++++++++++++++++++++++----------
 src/social/test_social.conf        |   2 +
 src/util/mq.c                      |   2 +-
 src/util/service.c                 |   1 +
 5 files changed, 117 insertions(+), 50 deletions(-)

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