1
0
mirror of https://github.com/oceanprotocol-archive/squid-js.git synced 2024-02-02 15:31:51 +01:00

Merge remote-tracking branch 'origin/master' into greenkeeper/typedoc-0.15.0

# Conflicts:
#	package-lock.json
This commit is contained in:
Sebastian Gerske 2019-07-30 14:15:52 +02:00
commit 78e5834e6c
2 changed files with 964 additions and 337 deletions

1299
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -59,7 +59,7 @@
"node-fetch": "^2.6.0",
"save-file": "^2.3.1",
"uuid": "^3.3.2",
"web3": "1.0.0-beta.37",
"web3": "1.2.0",
"whatwg-url": "^7.0.0"
},
"devDependencies": {