-Merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api
authorPhil <phil.buschmann@tum.de>
Mon, 11 Jun 2018 20:10:32 +0000 (22:10 +0200)
committerPhil <phil.buschmann@tum.de>
Mon, 11 Jun 2018 20:10:32 +0000 (22:10 +0200)
commit09b6a814e0ddcca0497c5cbf37940c27e6a5d9de
treef9884590450463aa95d9f858e9992e103467e89e
parentc1062075eddca49cfeaac8f7fd8c84e73198c2aa
parentbb581dc55bfb90fc7f34797111b55d16e69b7af0
-Merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api
src/gns/plugin_rest_gns.c
src/identity/plugin_rest_identity.c