- merge with master
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Wed, 29 Mar 2017 12:26:33 +0000 (14:26 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Wed, 29 Mar 2017 12:26:33 +0000 (14:26 +0200)
commitab281595eeb270120f89ec954a572f4fcf78fc53
tree335a2caf503596adc400c5ebb9fb742f097bc5a3
parent59d393a1124cfd1aaffdf994bf6f8a9baaac8361
parent2b87f173e360aaf4a3bac3fbc6e5b4dc44cf58cd
- merge with master
configure.ac
po/POTFILES.in
src/Makefile.am
src/exit/gnunet-daemon-exit.c
src/gns/gns_api.c
src/identity-provider/gnunet-service-identity-provider.c
src/identity-provider/identity_provider_api.c
src/identity-provider/plugin_rest_identity_provider.c
src/include/gnunet_credential_service.h
src/include/gnunet_protocols.h