Merge branch 'identity_abe' into identity_oidc
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Mon, 4 Dec 2017 16:39:55 +0000 (17:39 +0100)
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Mon, 4 Dec 2017 16:39:55 +0000 (17:39 +0100)
commitd4b252fd73bdda7be51a971ba06a650a1dceb45c
tree15026001f43b756e4a86d7ec80f62fc0d9756dea
parent514dd6f53cb735d0e48f35ddf92eae469c0abc8a
parent24a0b84d503375bf66b5df932cd18631cc88cf8d
Merge branch 'identity_abe' into identity_oidc
src/identity-provider/plugin_rest_identity_provider.c