Merge branch 'identity_abe' into identity_oidc
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Mon, 4 Dec 2017 16:48:36 +0000 (17:48 +0100)
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Mon, 4 Dec 2017 16:48:36 +0000 (17:48 +0100)
commite4a65af290c4fd85718b8497445ca16e0719bf5e
tree6a341a9cb45e54a32ef8ca8d2a5b8936c62754af
parentd4b252fd73bdda7be51a971ba06a650a1dceb45c
parent6e0922fc29b7bf481bf97c6ed269f85eadadd43e
Merge branch 'identity_abe' into identity_oidc