Skip to content

Commit

Permalink
Merge branch '1.x' into security-patch/ens
Browse files Browse the repository at this point in the history
  • Loading branch information
nivida authored Feb 2, 2020
2 parents b4769b6 + bccdd10 commit 7f5324e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 47 deletions.
60 changes: 14 additions & 46 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
"underscore": "^1.9.1",
"vinyl-source-stream": "^2.0.0",
"wait-port": "^0.2.6",
"@ensdomains/ens": "^0.3.11",
"@ensdomains/ens": "^0.4.0",
"@ensdomains/resolver": "^0.1.13",
"truffle": "^5.1.8",
"regenerator-runtime": "^0.13.3"
Expand Down

0 comments on commit 7f5324e

Please sign in to comment.