1
0
mirror of https://github.com/oceanprotocol/docs.git synced 2024-11-26 19:49:26 +01:00

Merge branch 'main' into Wanderclyffex-patch-general-questions

# Conflicts:
#	discover/faq.md
This commit is contained in:
Ana Loznianu 2023-09-20 22:57:52 +03:00
commit acdb863a90
2 changed files with 743 additions and 946 deletions

View File

@ -13,6 +13,8 @@ redirects:
core-concepts/fees: developers/contracts/fees.md
core-concepts/asset-pricing: developers/contracts/pricing-schemas.md
core-concepts/did-ddo: developers/identifiers.md
concepts/ocean-tokens/: discover/basic-concepts.md
tutorials/wallets-and-ocean-tokens: discover/wallets-and-ocean-tokens.md
using-ocean-market: user-guides/using-ocean-market.md
using-ocean-market/marketplace-publish-data-asset: user-guides/publish-data-nfts.md
using-ocean-market/marketplace-download-data-asset: user-guides/buy-data-nfts.md
@ -69,4 +71,4 @@ redirects:
user-guides/how-to-df-estimate-apy: user-guides/data-farming/how-to-estimate-apy.md
rewards/df-basic: rewards/df-guides.md
rewards/veocean: rewards/df-veocean.md
rewards/df-max-out-yield: rewards/df-volumedf.md
rewards/df-max-out-yield: rewards/df-volumedf.md

File diff suppressed because it is too large Load Diff