diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-08-26 16:17:12 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-08-26 16:17:12 +0200 |
| commit | 019e10d51e695d4b40399edb0f0d4b43f59f9d14 (patch) | |
| tree | fbf8ac7f919e7d4c4d636be1cf76127b2edd1f6e /articles | |
| parent | 2f4aaca8502a60cabdfec6d011141d2604f08a0b (diff) | |
| parent | 64373e23adb2094a02f8e0f20bfdf73939a6c01a (diff) | |
| download | wallet-core-019e10d51e695d4b40399edb0f0d4b43f59f9d14.tar.gz wallet-core-019e10d51e695d4b40399edb0f0d4b43f59f9d14.tar.bz2 wallet-core-019e10d51e695d4b40399edb0f0d4b43f59f9d14.zip | |
Merge branch 'master' of git+ssh://taler.net/var/git/wallet-webex
Diffstat (limited to 'articles')
| -rw-r--r-- | articles/ui/ui.tex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/articles/ui/ui.tex b/articles/ui/ui.tex index 1ec74dbf9..edbd02149 100644 --- a/articles/ui/ui.tex +++ b/articles/ui/ui.tex @@ -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", |