[GNUnet-SVN] [gnunet] 03/03: Merge branch 'master' of gnunet.org:gnunet

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnunet.

commit 6485325f72b588c838f8b6d9e12c50c642e493b8
Merge: a5d951576 e16d72da2
Author: ng0 <address@hidden>
AuthorDate: Sun Feb 17 00:42:02 2019 +0000

    Merge branch 'master' of gnunet.org:gnunet

 contrib/apparmor/gnunet-mesh       | 13 -------------
 src/ats/Makefile.am                |  1 +
 src/gns/test_gns_rel_expiration.sh |  7 +++++++
 src/util/gnunet-service-resolver.c |  2 +-
 src/util/scheduler.c               |  4 ++--
 5 files changed, 11 insertions(+), 16 deletions(-)

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