Merge branch 'develop' into tcoulter

Conflicts: dist/web3-light.js.map dist/web3-light.min.js dist/web3.js.map dist/web3.min.js
web3 · May 10, 2015 · 091c8e5 · 091c8e5
2 parents 2ca4240 + 272837e
commit 091c8e5
Show file tree

Hide file tree

Showing 22 changed files with 766 additions and 1,652 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "web3",
   "namespace": "ethereum",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "Ethereum Compatible JavaScript API",
   "main": [
     "./dist/web3.js",