Merge branch 'identity_oidc' of git-int.aisec.fraunhofer.de:sas/gnunet-mirror into...
authorPhil <phil.buschmann@tum.de>
Thu, 7 Dec 2017 11:31:52 +0000 (11:31 +0000)
committerPhil <phil.buschmann@tum.de>
Thu, 7 Dec 2017 11:31:52 +0000 (11:31 +0000)
commitcd0ff18525770f9f3578c90a2dc6938911c910df
treebdd8237318ed55926e5fbd8a2fa5cd8213983f63
parent5126e9d42b24a0a6cf26de79b65bcd23790dee9b
parentc68eae71c8474e27725acec4e6b2194e20626042
Merge branch 'identity_oidc' of git-int.aisec.fraunhofer.de:sas/gnunet-mirror into identity_oidc