[GNUnet-SVN] [gnunet] 16/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 c75b7de71443a6c993918c2440388aca36296e2e
Merge: a89f95db7 5da3c7cf7
Author: Phil <address@hidden>
AuthorDate: Mon Dec 11 13:03:38 2017 +0100

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

 src/include/gnunet_rest_lib.h | 24 ++++++++++++++++++++++++
 src/rest/gnunet-rest-server.c | 31 +++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

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