diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-01-27 10:52:02 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-01-27 10:52:02 +0100 |
| commit | 98909f952b3b7d3d257e623e4b887c35aa140768 (patch) | |
| tree | a93c760a94ccc030b8dbcc80ff3b37d3aa2005e6 /docs | |
| parent | ebf6d450d1e77d1af5b4d1ab707c713b9fcd9e46 (diff) | |
| parent | e117d8a24f4d18c4494cad38211a340277bc9842 (diff) | |
| download | docs-98909f952b3b7d3d257e623e4b887c35aa140768.tar.gz docs-98909f952b3b7d3d257e623e4b887c35aa140768.tar.bz2 docs-98909f952b3b7d3d257e623e4b887c35aa140768.zip | |
Merge branch 'split' of ssh://taler.net/api into split
Conflicts:
docs/example-essay-store.rst
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/example-essay-store.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/example-essay-store.rst b/docs/example-essay-store.rst index 4687083c..14cb31dc 100644 --- a/docs/example-essay-store.rst +++ b/docs/example-essay-store.rst @@ -522,7 +522,7 @@ Required" HTTP status code, along with the HTTP headers ``X-Taler-Contract-Hash` .. FIXME: - Are those three parameters anywhere, at least 'kindof' introduced? + Are those three parameters previously introduced? Upon returning such a response, the wallet will automatically send the payment to the URL indicated in ``X-Taler-Pay-Url``. |