summaryrefslogtreecommitdiff
path: root/index.rst
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2021-01-26 12:05:48 +0100
committerChristian Grothoff <christian@grothoff.org>2021-01-26 12:05:48 +0100
commit9fa2be0bf07201742e0c9eda1424b8a72151296f (patch)
tree0a0120a0e30046e62df1aba18df8ec155aac8482 /index.rst
parent1ae896e4e7b378d1f3d8fc2f563969664c57ed00 (diff)
parent678c18fed256b70f45c47540b7ad12ed10c9286a (diff)
downloaddocs-9fa2be0bf07201742e0c9eda1424b8a72151296f.tar.gz
docs-9fa2be0bf07201742e0c9eda1424b8a72151296f.tar.bz2
docs-9fa2be0bf07201742e0c9eda1424b8a72151296f.zip
merge conflict
Diffstat (limited to 'index.rst')
-rw-r--r--index.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/index.rst b/index.rst
index c64f8c85..5fa291f8 100644
--- a/index.rst
+++ b/index.rst
@@ -53,7 +53,7 @@ Documentation Overview
core/index
taler-exchange-manual
taler-merchant-manual
- taler-wallet
+ taler-wallet-cli-manual
taler-nfc-guide.rst
taler-merchant-api-tutorial
taler-merchant-pos-terminal
@@ -61,6 +61,7 @@ Documentation Overview
taler-backoffice-manual
taler-auditor-manual
taler-developer-manual
+ taler-wallet
design-documents/index
anastasis
libeufin/index