[GNUnet-SVN] [gnunet] 21/45: -merge

[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 2e810e7d86eae7fce73f72d1b83a01e7607a357d
Merge: c78175649 a38dbfc3c
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Thu Dec 14 17:49:25 2017 +0100

    -merge

 .../plugin_rest_identity_provider.c                | 349 ++++++++++++++++-----
 src/rest/rest.conf                                 |   2 +-
 2 files changed, 274 insertions(+), 77 deletions(-)


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