-merge branch 'identity_oidc' of git-int.aisec.fraunhofer.de:sas/gnunet-mirror into...
authorPhil <phil.buschmann@tum.de>
Mon, 11 Dec 2017 12:06:52 +0000 (13:06 +0100)
committerPhil <phil.buschmann@tum.de>
Mon, 11 Dec 2017 12:06:52 +0000 (13:06 +0100)
commite87ca099f191647b1c218fc213463433366db447
tree683bcf9f12576b8d26515b2ab671a98d9c8676b4
parentc75b7de71443a6c993918c2440388aca36296e2e
parent5cefcd299ee56a92285569b1d96fb553a6582255
-merge branch 'identity_oidc' of git-int.aisec.fraunhofer.de:sas/gnunet-mirror into identity_oidc