Merge branch '1.0' into 1.0

web3 · Aug 7, 2018 · bcacaeb · bcacaeb
2 parents 6966cac + 73c1e0d
commit bcacaeb
Show file tree

Hide file tree

Showing 68 changed files with 8,138 additions and 50,311 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,6 @@ bower_components
 /bower
 .idea/
 .npm/
-.vscode/
+.vscode/
+dist/
+!./dist/web3.min.js
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "namespace": "ethereum",
   "name": "web3",
-  "version": "1.0.0-beta.34",
+  "version": "1.0.0-beta.35",
   "description": "Ethereum JavaScript API",
   "license": "LGPL-3.0",
   "main": [