Merge branch '1.x' into enhancement/add-receipt-to-errors

web3 · Dec 9, 2019 · 0ff7669 · 0ff7669
2 parents c6210c9 + b35e418
commit 0ff7669
Show file tree

Hide file tree

Showing 7 changed files with 3,305 additions and 3,126 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,4 @@ dist/
 packages/web3/dist/
 lerna-debug.log
 !./dist/web3.min.js
+.nyc_output/