Merge remote-tracking branch 'origin/identity_abe' into identity_oidc
authorPhil <phil.buschmann@tum.de>
Mon, 4 Dec 2017 15:19:45 +0000 (15:19 +0000)
committerPhil <phil.buschmann@tum.de>
Mon, 4 Dec 2017 15:19:45 +0000 (15:19 +0000)
commit5126e9d42b24a0a6cf26de79b65bcd23790dee9b
tree464717770d6e372c22da796599c454ade2328f6b
parent514dd6f53cb735d0e48f35ddf92eae469c0abc8a
parentb16fa2d88aabb18f222b40136d6ace68ffc104c6
Merge remote-tracking branch 'origin/identity_abe' into identity_oidc
src/identity-provider/plugin_rest_identity_provider.c