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)
commitf2d31fb82a314dcf6819dd494ff4a11e4f871c4e
tree029043b01c23f6e780f7fd01c15d467c568664ff
parent9f5ea1f7f809d73cbeb7ce5538550c42e978d340
parent3f52ce03cb13118bef9a6fbe380f229e2cbec45f
Merge remote-tracking branch 'origin/master' into identity_oidc
src/identity-provider/plugin_rest_identity_provider.c
src/include/gnunet_rest_lib.h