[taler-anastasis] 04/04: Merge

[gnunet]

This is an automated email from the git hooks/post-receive script.

dennis-neufeld pushed a commit to branch master
in repository anastasis.

commit 3b8bf38938c543b426cd19897d4951c515de00b8
Merge: 0037ef6 0992b47
Author: Dennis Neufeld <address@hidden>
AuthorDate: Thu Dec 19 16:41:47 2019 +0000

    Merge

 src/backend/anastasis-httpd.c                   |  6 +++++-
 src/backend/anastasis-httpd_policy.c.uncrustify |  0
 src/backend/anastasis-httpd_policy_upload.c     |  9 ++++++---
 src/include/anastasis.h                         | 27 +++++++++++++++++++++++++
 src/include/anastasis_crypto_lib.h              |  7 ++++++-
 src/include/anastasis_service.h                 |  2 --
 src/include/anastasis_testing_lib.h             |  1 +
 src/lib/anastasis_api_policy_lookup.c           |  2 ++
 src/lib/anastasis_api_policy_store.c            |  3 ++-
 src/lib/test_anastasis_api.c                    |  2 ++
 src/lib/testing_api_cmd_policy_store.c          |  2 ++
 src/lib/testing_api_helpers.c                   |  1 -
 src/stasis/plugin_anastasis_postgres.c          |  2 +-
 13 files changed, 54 insertions(+), 10 deletions(-)


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