Merge branch 'master' into jg-signer-api-queries-2
Showing
- Cargo.lock 1 addition, 1 deletionCargo.lock
- ethcore/src/miner/miner.rs 20 additions, 20 deletionsethcore/src/miner/miner.rs
- ethcore/src/verification/queue/mod.rs 252 additions, 35 deletionsethcore/src/verification/queue/mod.rs
- js/package.json 1 addition, 1 deletionjs/package.json
- js/src/3rdparty/shapeshift/shapeshift.js 22 additions, 4 deletionsjs/src/3rdparty/shapeshift/shapeshift.js
- js/src/api/contract/contract.js 131 additions, 33 deletionsjs/src/api/contract/contract.js
- js/src/api/contract/contract.spec.js 10 additions, 5 deletionsjs/src/api/contract/contract.spec.js
- js/src/api/format/input.js 11 additions, 5 deletionsjs/src/api/format/input.js
- js/src/api/util/format.js 4 additions, 0 deletionsjs/src/api/util/format.js
- js/src/api/util/index.js 2 additions, 1 deletionjs/src/api/util/index.js
- js/src/contracts/sms-verification.js 27 additions, 10 deletionsjs/src/contracts/sms-verification.js
- js/src/modals/Shapeshift/shapeshift.js 14 additions, 0 deletionsjs/src/modals/Shapeshift/shapeshift.js
- js/src/redux/providers/balances.js 217 additions, 91 deletionsjs/src/redux/providers/balances.js
- js/test/mockRpc.js 2 additions, 1 deletionjs/test/mockRpc.js
Please register or sign in to comment