[GNUnet-SVN] [gnunet] 38/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 e0eb3c8ba84a1dfb49f66e84a65b09b1d4ade42a
Merge: 95385d9d2 130d7e66a
Author: t3sserakt <address@hidden>
AuthorDate: Fri Nov 24 21:58:53 2017 +0100

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

 src/include/gnunet_protocols.h           |   5 +-
 src/multicast/gnunet-service-multicast.c | 208 ++++++++++++++++++++-----------
 src/multicast/multicast_api.c            |  51 ++++----
 src/psyc/gnunet-service-psyc.c           |   2 +
 src/psyc/psyc_api.c                      |  30 +----
 src/social/gnunet-service-social.c       |   2 +
 src/social/social_api.c                  |   1 +
 7 files changed, 166 insertions(+), 133 deletions(-)

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