[taler-merchant] 02/05: Merge branch 'master' of git+ssh://git.taler.net/merchant

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

commit 1f45f2b48d719c4a5cae354f667cec75e9eff94a
Merge: 3697000 3eef3ab
Author: Christian Grothoff <address@hidden>
AuthorDate: Sat Feb 29 15:43:58 2020 +0100

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

 src/backend/taler-merchant-httpd_order.c |  4 ++--
 src/lib/merchant_api_proposal.c          | 12 +++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

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