[taler-merchant] 240/277: Merge branch 'protocolV1' of ssh://git.taler.net/merchant into protocolV1

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

commit 66f0f2d7acaba870e2b8aa18cddcecb2a30cee2d
Merge: cac0965 0748ecd
Author: Jonathan Buchanan <jonathan.russ.buchanan@gmail.com>
AuthorDate: Mon Jun 22 16:35:21 2020 -0400

    Merge branch 'protocolV1' of ssh://git.taler.net/merchant into protocolV1

 .../taler-merchant-httpd_private-get-reserves-ID.c |  7 +++++--
 src/backenddb/plugin_merchantdb_postgres.c         | 22 ++++++++++++++--------
 src/include/taler_merchant_service.h               |  2 ++
 src/include/taler_merchantdb_plugin.h              |  2 ++
 src/lib/merchant_api_get_reserve.c                 |  6 ++++++
 src/testing/testing_api_cmd_get_reserve.c          |  1 +
 6 files changed, 30 insertions(+), 10 deletions(-)

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