[taler-merchant] 179/277: Merge branch 'protocolV1' of git+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 96affdc638c66e04adccbf1cf3ff427cd37f0ada
Merge: 7811904 a48cac9
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Thu Jun 4 21:00:43 2020 +0200

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

 src/backenddb/test_merchantdb.c       | 1089 +++++++++++++--------------------
 src/lib/Makefile.am                   |    1 +
 src/lib/merchant_api_delete_reserve.c |  262 ++++++++
 3 files changed, 701 insertions(+), 651 deletions(-)

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