[GNUnet-SVN] [taler-api] 22/22: Merge branch 'split' of ssh://taler.net/api into split

[gnunet]

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

marcello pushed a commit to branch master
in repository api.

commit 98909f952b3b7d3d257e623e4b887c35aa140768
Merge: ebf6d45 e117d8a
Author: Marcello Stanisci <address@hidden>
AuthorDate: Fri Jan 27 10:52:02 2017 +0100

    Merge branch 'split' of ssh://taler.net/api into split
    
    Conflicts:
            docs/example-essay-store.rst

 docs/example-essay-store.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc docs/example-essay-store.rst
index 4687083,6cd8600..14cb31d
--- a/docs/example-essay-store.rst
+++ b/docs/example-essay-store.rst
@@@ -522,7 -523,7 +522,7 @@@ Required" HTTP status code, along with 
  
  ..
    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``.

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