status-im
/
web3.js
mirror of https://github.com/status-im/web3.js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:ethereum/web3.js into develop

This commit is contained in:
Fabian Vogelsteller 2017-06-20 14:49:30 +02:00
parent d4bb4d5978 dbefa39e52
commit f43d6784fc
No known key found for this signature in database
GPG Key ID: E51EADA77F1A4124
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -115,5 +115,5 @@ npm test
[coveralls-image]: https://coveralls.io/repos/ethereum/web3.js/badge.svg?branch=master
[coveralls-url]: https://coveralls.io/r/ethereum/web3.js?branch=master
[waffle-image]: https://badge.waffle.io/ethereum/web3.js.svg?label=ready&title=Ready
[waffle-url]: http://waffle.io/ethereum/web3.js
[waffle-url]: https://waffle.io/ethereum/web3.js

2
package.json
View File

@ -8,7 +8,7 @@
"lib": "./lib"
},
"dependencies": {
"bignumber.js": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2",
"bignumber.js": "https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2",
"crypto-js": "^3.1.4",
"utf8": "^2.1.1",
"xhr2": "*",