[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-api] 22/22: Merge branch 'split' of ssh://taler.net/
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-api] 22/22: Merge branch 'split' of ssh://taler.net/api into split |
Date: |
Fri, 27 Jan 2017 10:52:42 +0100 |
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
- [GNUnet-SVN] [taler-api] 12/22: fix link, (continued)
- [GNUnet-SVN] [taler-api] 12/22: fix link, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 16/22: Moving payment protocol on 'docs', gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 05/22: Fix missing links, commenting out superfluous/outdated section, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 01/22: Proof-reading blog example page, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 19/22: Appears?, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 04/22: Still on splitting, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 07/22: Nothing but APIs under api.taler.net, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 21/22: Removing trailing .rst from imported files, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 03/22: Splitting BUILDIR, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 20/22: Reverting previous (test) commit, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 22/22: Merge branch 'split' of ssh://taler.net/api into split,
gnunet <=
- [GNUnet-SVN] [taler-api] 18/22: Minor fixes on rendering, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 08/22: Minor fixes on rendering, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 14/22: Still on splitting, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 17/22: Nothing but APIs under api.taler.net, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 15/22: Fix missing links, commenting out superfluous/outdated section, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 11/22: Proof-reading blog example page, gnunet, 2017/01/27
- [GNUnet-SVN] [taler-api] 13/22: Splitting BUILDIR, gnunet, 2017/01/27