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

Merge branch 'master' into update-run-a-keeper-page

This commit is contained in:
Troy McConaghy 2019-04-11 10:54:08 +02:00 committed by GitHub
commit 49f9c14df1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View File

@ -25,7 +25,7 @@ Someone who wants assets. An example is a data scientist working at an economic
## Marketplace
A service where publishers can list what assets they have, and consumers can see what's available then buy it (or get it for free). Every marketplace has a database where they store metadata about the assets they know about (but not the assets themselves). The Ocean network supports many marketplaces/tribes.
A service where publishers can list what assets they have, and consumers can see what's available then buy it (or get it for free). Every marketplace has a database where they store metadata about the assets they know about (but not the assets themselves). The Ocean network supports many marketplaces.
## Verifier

2
external/dev-ocean vendored

@ -1 +1 @@
Subproject commit c9c5a9ddbf7fcc661fd33ff246a3f5ab6f8812f3
Subproject commit 86049043ad5b53932a78210636f93f049e9d8611

2
external/squid-js vendored

@ -1 +1 @@
Subproject commit 7adcb1a87e3873980fab6d691ec886245533d8fd
Subproject commit dcdfe98f8176a2bbf785945b9b077cc696c0c0a9