-merge branch 'identity_oidc' of git-int.aisec.fraunhofer.de:sas/gnunet-mirror into...
authorPhil <phil.buschmann@tum.de>
Mon, 11 Dec 2017 12:03:38 +0000 (13:03 +0100)
committerPhil <phil.buschmann@tum.de>
Mon, 11 Dec 2017 12:03:38 +0000 (13:03 +0100)
commitc75b7de71443a6c993918c2440388aca36296e2e
tree875d019a2770d9f8d2a97d2dac06771221302792
parenta89f95db74b5320e6fc14806579f4ad7ceb7ba9c
parent5da3c7cf721ee3f6fe6efe515b39e4a370650366
-merge branch 'identity_oidc' of git-int.aisec.fraunhofer.de:sas/gnunet-mirror into identity_oidc