[GNUnet-SVN] [gnunet] 09/45: Merge branch 'identity_oidc' of git-int.aisec.fraunhofer.de:sas/gnunet-mirror into identity_oidc

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit ecfab268bb34efb1305bf5b7894db47cd916a6a7
Merge: 28e046cf5 089a4f09b
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Thu Dec 7 13:04:45 2017 +0100

    Merge branch 'identity_oidc' of 
git-int.aisec.fraunhofer.de:sas/gnunet-mirror into identity_oidc

 src/identity-provider/logfile.txt                  |  73 ++++++
 .../plugin_rest_identity_provider.c                | 278 ++++++++++++---------
 src/identity-provider/vgcore.2692                  | Bin 0 -> 72450048 bytes
 3 files changed, 233 insertions(+), 118 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
address@hidden