[GNUnet-SVN] [gnunet] 06/64: Merge branch 'fix_social' of ssh://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 2af1f1b81cefe8307c702f304451ae67c0fa1437
Merge: 7ca96c1ce b829c5817
Author: lurchi <address@hidden>
AuthorDate: Fri Oct 13 22:18:43 2017 +0200

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

 src/social/gnunet-service-social.c |  36 ++++++-------
 src/social/gnunet-social.c         |  26 ++++-----
 src/social/test_social.c           | 106 ++++++++++++++++++-------------------
 3 files changed, 84 insertions(+), 84 deletions(-)

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