-Merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api

author Phil <phil.buschmann@tum.de>

Mon, 11 Jun 2018 20:10:32 +0000 (22:10 +0200)

committer Phil <phil.buschmann@tum.de>

Mon, 11 Jun 2018 20:10:32 +0000 (22:10 +0200)
author Phil <phil.buschmann@tum.de>
Mon, 11 Jun 2018 20:10:32 +0000 (22:10 +0200)
committer Phil <phil.buschmann@tum.de>
Mon, 11 Jun 2018 20:10:32 +0000 (22:10 +0200)
diff --cc src/gns/plugin_rest_gns.c
Simple merge
diff --cc src/identity/plugin_rest_identity.c
Simple merge
author	Phil <phil.buschmann@tum.de>
	Mon, 11 Jun 2018 20:10:32 +0000 (22:10 +0200)
committer	Phil <phil.buschmann@tum.de>
	Mon, 11 Jun 2018 20:10:32 +0000 (22:10 +0200)
		1	2
src/gns/plugin_rest_gns.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/identity/plugin_rest_identity.c	patch \|	diff1 \|	diff2 \|	blob \| history