Merge branch 'identity_abe' into identity_oidc
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Thu, 7 Dec 2017 12:03:07 +0000 (13:03 +0100)
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Thu, 7 Dec 2017 12:03:07 +0000 (13:03 +0100)
commit28e046cf5376171ef86300fc1a0097f7e71cb1e6
treea516a5457825389a26b50fe55ad1c55f63055409
parentc68eae71c8474e27725acec4e6b2194e20626042
parent9e486ede076d2139b1c655411ce9560d9baf6984
Merge branch 'identity_abe' into identity_oidc