[GNUnet-SVN] [gnunet] 04/45: Merge branch 'identity_abe' 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 e4a65af290c4fd85718b8497445ca16e0719bf5e
Merge: d4b252fd7 6e0922fc2
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Mon Dec 4 17:48:36 2017 +0100

    Merge branch 'identity_abe' into identity_oidc

 src/identity-attribute/Makefile.am                  |  3 +--
 src/identity-provider/Makefile.am                   |  3 ++-
 src/{identity-attribute => identity-provider}/jwt.c |  2 +-
 src/include/gnunet_identity_attribute_lib.h         | 13 -------------
 4 files changed, 4 insertions(+), 17 deletions(-)

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