Merge branch '1.0' into issue_1188_fix_web3_eth_Contract_shared_state

web3 · Dec 11, 2017 · cfa4982 · cfa4982
2 parents 16087a0 + dbf7bfc
commit cfa4982
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -134,8 +134,9 @@ npm test
 
 ### Similar libraries in other languages
  - Python [Web3.py](https://github.com/pipermerriam/web3.py)
- - Haskell [hs-web3](https://github.com/airalab/hs-web3)
- - Java [web3j](https://github.com/web3j/web3j)
+ - Haskell [hs-web3](https://github.com/airalab/hs-web3)		   - Haskell [hs-web3](https://github.com/airalab/hs-web3)
+ - Java [web3j](https://github.com/web3j/web3j)		   - Java [web3j](https://github.com/web3j/web3j)
+ - Scala [web3j-scala](https://github.com/mslinn/web3j-scala)
 
 
 [repo]: https://github.com/ethereum/web3.js

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "namespace": "ethereum",
   "name": "web3",
-  "version": "1.0.0-beta.24",
+  "version": "1.0.0-beta.26",
   "description": "Ethereum JavaScript API",
   "license": "LGPL-3.0",
   "main": [

diff --git a/dist/web3.min.js b/dist/web3.min.js
diff --git a/package.js b/package.js
@@ -1,7 +1,7 @@
 /* jshint ignore:start */
 Package.describe({
     name: 'ethereum:web3',
-    version: '1.0.0-beta.24',
+    version: '1.0.0-beta.26',
     summary: 'Ethereum JavaScript API, middleware to talk to a ethreum node over RPC',
     git: 'https://github.com/ethereum/ethereum.js',
     // By default, Meteor will default to using README.md for documentation.

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "web3",
   "namespace": "ethereum",
-  "version": "1.0.0-beta.24",
+  "version": "1.0.0-beta.26",
   "description": "Ethereum JavaScript API wrapper repository",
   "license": "LGPL-3.0",
   "directories": {

diff --git a/packages/web3/index.d.ts b/packages/web3/index.d.ts
@@ -22,7 +22,6 @@ declare class Web3 {
   providers: t.Providers
   setProvider(provider: t.Provider): void
   utils: t.Utils
-
 }
 
-export default Web3
+export = Web3;