Merge remote-tracking branch 'gnunet/master' into identity_oidc
authorPhil <phil.buschmann@tum.de>
Thu, 11 Jan 2018 09:21:52 +0000 (10:21 +0100)
committerPhil <phil.buschmann@tum.de>
Thu, 11 Jan 2018 09:21:52 +0000 (10:21 +0100)
commit60c963315271ce4314b708bef519eb4fb64f0979
tree93e5b2a48279b32568531485eed21229b3c374c5
parentafb2171eb752d82918048b393fda6f01f863b49a
parentbca8edf17fc90862e7267ff22b70a1b7dc94ec96
Merge remote-tracking branch 'gnunet/master' into identity_oidc
src/rest/gnunet-rest-server.c