[GNUnet-SVN] [gnunet] 06/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 cd0ff18525770f9f3578c90a2dc6938911c910df
Merge: 5126e9d42 c68eae71c
Author: Phil <address@hidden>
AuthorDate: Thu Dec 7 11:31:52 2017 +0000

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

 po/POTFILES.in                                     |   2 +-
 src/identity-attribute/Makefile.am                 |   4 +-
 src/identity-attribute/identity_attribute.c        | 176 ++++++++++++
 .../plugin_identity_attribute_gnuid.c              |   4 +-
 src/identity-provider/Makefile.am                  |   3 +-
 src/identity-provider/gnunet-idp.c                 |  40 ++-
 src/identity-provider/jwt.c                        |  30 +-
 .../plugin_rest_identity_provider.c                | 316 +++++++++++----------
 src/include/gnunet_identity_attribute_lib.h        |  46 +++
 9 files changed, 447 insertions(+), 174 deletions(-)

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