diff options
author | Christian Grothoff <christian@grothoff.org> | 2021-01-26 12:05:48 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2021-01-26 12:05:48 +0100 |
commit | 9fa2be0bf07201742e0c9eda1424b8a72151296f (patch) | |
tree | 0a0120a0e30046e62df1aba18df8ec155aac8482 /index.rst | |
parent | 1ae896e4e7b378d1f3d8fc2f563969664c57ed00 (diff) | |
parent | 678c18fed256b70f45c47540b7ad12ed10c9286a (diff) | |
download | docs-9fa2be0bf07201742e0c9eda1424b8a72151296f.tar.gz docs-9fa2be0bf07201742e0c9eda1424b8a72151296f.tar.bz2 docs-9fa2be0bf07201742e0c9eda1424b8a72151296f.zip |
merge conflict
Diffstat (limited to 'index.rst')
-rw-r--r-- | index.rst | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 |