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

[gnunet]

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

grothoff pushed a commit to branch master
in repository docs.

commit a36d95c97e3187bc245d8ea9e524011c9a48428c
Merge: 3653625 002eea9
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Aug 16 16:15:34 2020 +0200

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

 core/api-merchant.rst | 181 ++++++++++++++++++++++++++++++--------------------
 taler-wallet.rst      |  81 +++++++++++++++++++---
 2 files changed, 179 insertions(+), 83 deletions(-)

diff --cc core/api-merchant.rst
index 8849db2,f576e10..3c0ea71
--- a/core/api-merchant.rst
+++ b/core/api-merchant.rst
@@@ -1438,23 -1428,8 +1438,17 @@@ Payment processin
        // Amount that was refunded in total.
        refund_amount: Amount;
  
-       // Successful refunds for this payment, empty array for none.
-       refunds: MerchantCoinRefundStatus[];
- 
-       // Public key of the merchant.
-       merchant_pub: EddsaPublicKey;
- 
      }
  
 +    .. ts:def:: StatusGotoResponse
 +
 +    interface StatusGotoResponse {
 +      // The client should go to the fulfillment URL, it may be ready or
 +      // might have some other interesting status.
 +      fulfillment_url: string;
 +
 +    }
 +
    .. ts:def:: StatusUnpaidResponse
  
      interface StatusUnpaidResponse {

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