Merge branch 'fix_social'
authorlurchi <lurchi@strangeplace.net>
Sat, 30 Dec 2017 19:46:59 +0000 (20:46 +0100)
committerlurchi <lurchi@strangeplace.net>
Sat, 30 Dec 2017 19:46:59 +0000 (20:46 +0100)
commit5c8feda7faa01365a1fb6983595ceb65dfe4fb11
tree3521d1131a2f3d063455a58c86c42af3c7551077
parentd01f1bd83384cbdb74fa963526d31270bf58c805
parent8412625bb5191040389610364167c768bb55efb4
Merge branch 'fix_social'
src/core/gnunet-service-core_kx.c
src/social/gnunet-social.c
src/social/social_api.c
src/util/scheduler.c