[taler-docs] 11/11: Merge branch 'feature/tokens'

[gnunet]

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

christian-blaettler pushed a commit to branch master
in repository docs.

commit a4f2424c65d2fa67b2c69549d9b9a7b3c60152ce
Merge: e8f307fe 7af0b3eb
Author: Christian Blättler <blatc2@bfh.ch>
AuthorDate: Fri Mar 15 09:46:48 2024 +0100

    Merge branch 'feature/tokens'

 core/api-merchant.rst                     | 238 +++++++++++++++++++++++++++++-
 design-documents/046-mumimo-contracts.rst |  70 ++++-----
 2 files changed, 273 insertions(+), 35 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.