Merge branch 'master' of git+ssh://taler.net/var/git/wallet-webex

This commit is contained in:
Christian Grothoff 2016-08-26 16:17:12 +02:00
commit 019e10d51e

View File

@ -804,7 +804,7 @@ a Taler wallet is installed (as it is in Figure~\ref{fig:shopping}).
"exchanges":[{"master_pub":"1T5FA8VQHMMKBHDMYPRZA2ZFK2S63AKF0YTHJZWFKF45K2JGC8H0",
"url":"https://exchange/"}],
"expiry":"/Date(1480119270)/",
"fulfillment_url": "https://shop/essay/42",
"fulfillment_url": "https://shop/article/42?tid=249960194066269?time=1471479270",
"max_fee":{"currency":"EUR","fraction":01,"value":0},
"merchant":{"address":"Mailbox 4242","jurisdiction":"Jersey","name":"Shop Inc."},
"merchant_pub":"Y1ZAR5346J3ZTEXJCHQY9NJN78EZ2HSKZK8M0MYTNRJG5N0HD520",