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

Merge pull request #38 from oceanprotocol/feature/dev-ocean-master

switch to master of dev-ocean
This commit is contained in:
Matthias Kretschmann 2018-11-16 18:01:23 +01:00 committed by GitHub
commit 85d0418836
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

1
.gitmodules vendored
View File

@ -1,3 +1,4 @@
[submodule "external/dev-ocean"]
path = external/dev-ocean
url = https://github.com/oceanprotocol/dev-ocean
branch = master

2
external/dev-ocean vendored

@ -1 +1 @@
Subproject commit e4ba686bd8a083509e43f39c60edee14d7197724
Subproject commit 0aeaf4eeadda2901da629ead14748c89d05c26dc