[taler-anastasis] 02/02: merge

[gnunet]

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

ds-meister pushed a commit to branch master
in repository anastasis.

commit 1ed1642ba86049deecc91658032471f8fe43be27
Merge: 33166ca e47001e
Author: Dominik Meister <dominik.meister@hotmail.ch>
AuthorDate: Tue Oct 27 14:28:20 2020 +0100

    merge

 src/backend/anastasis-httpd_truth.c               |  1 -
 src/backend/anastasis_authorization_plugin.c      |  2 --
 src/backend/anastasis_authorization_plugin_file.c |  1 +
 src/lib/anastasis.c                               | 12 ------------
 src/lib/anastasis_api_policy_store.c              |  3 ---
 src/lib/testing_api_cmd_truth_store.c             |  2 --
 src/lib/testing_cmd_policy_create.c               |  1 -
 src/lib/testing_cmd_recover_secret.c              |  1 -
 src/lib/testing_cmd_secret_share.c                |  9 ++++-----
 src/lib/testing_cmd_truth_upload.c                |  1 -
 src/stasis/anastasis_db_plugin.c                  |  3 ---
 src/stasis/test_anastasis_db.c                    |  4 ----
 12 files changed, 5 insertions(+), 35 deletions(-)

diff --cc src/backend/anastasis_authorization_plugin_file.c
index 3a2fb11,ecc0dbe..0a8d8c5
--- a/src/backend/anastasis_authorization_plugin_file.c
+++ b/src/backend/anastasis_authorization_plugin_file.c
@@@ -19,8 -19,8 +19,9 @@@
   * @author Dominik Meister
   */
  #include "platform.h"
 +#include "anastasis-httpd.h"
  #include "anastasis_authorization_plugin.h"
+ #include <taler/taler_mhd_lib.h>
  
  
  /**

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.