Merge remote-tracking branch 'origin/master' into identity_oidc
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Mon, 8 Jan 2018 09:49:06 +0000 (10:49 +0100)
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Mon, 8 Jan 2018 09:49:06 +0000 (10:49 +0100)
1  2 
src/identity-provider/plugin_rest_identity_provider.c
src/include/gnunet_rest_lib.h

Simple merge