Jaco Greeff db9a70d008 Merge branch 'master' into ui-2 ... # Conflicts: # js/package-lock.json # js/src/Application/application.js # js/src/api/rpc/parity/parity.js # js/src/api/subscriptions/manager.spec.js # js/src/api/subscriptions/personal.spec.js # js/src/jsonrpc/interfaces/parity.js # js/src/mobx/hardwareStore.js # js/src/mobx/hardwareStore.spec.js # js/src/modals/index.js # js/src/redux/providers/signerMiddleware.spec.js # js/src/ui/SelectionList/selectionList.css # js/src/views/Account/account.spec.js # js/src/views/Accounts/accounts.spec.js # js/src/views/Application/Extension/store.js # js/src/views/Signer/components/SignRequest/signRequest.spec.js		2017-09-18 11:44:09 +02:00
..
ethereum	Merge branch 'master' into ui-2	2017-09-18 11:44:09 +02:00
wasm-tests@fcac936bf6	Update test execution	2017-09-18 10:15:36 +02:00
authority_round.json	Move more params to the common section. (#6134)	2017-07-31 12:34:29 +02:00
basic_authority.json	Move more params to the common section. (#6134)	2017-07-31 12:34:29 +02:00
constructor.json	Chainspec validation (#6197)	2017-08-02 12:50:36 +02:00
instant_seal.json	Move more params to the common section. (#6134)	2017-07-31 12:34:29 +02:00
null_morden_with_reward.json	Fixed comments after the review	2017-08-02 17:10:06 +02:00
null_morden.json	Fixed comments after the review	2017-08-02 17:10:06 +02:00
null.json	Move more params to the common section. (#6134)	2017-07-31 12:34:29 +02:00
tendermint.json	Move more params to the common section. (#6134)	2017-07-31 12:34:29 +02:00
validator_contract.json	Move more params to the common section. (#6134)	2017-07-31 12:34:29 +02:00
validator_multi.json	Move more params to the common section. (#6134)	2017-07-31 12:34:29 +02:00
validator_safe_contract.json	Chainspec validation (#6197)	2017-08-02 12:50:36 +02:00