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
..
tests@ef191fdc61	Byzantium updates (#5855)	2017-09-15 21:07:54 +02:00
byzantium_test.json	Byzantium updates (#5855)	2017-09-15 21:07:54 +02:00
classic.json
constantinople_test.json	Byzantium updates (#5855)	2017-09-15 21:07:54 +02:00
eip150_test.json
eip161_test.json
expanse.json
foundation.json	Byzantium updates (#5855)	2017-09-15 21:07:54 +02:00
frontier_like_test.json
frontier_test.json
homestead_test.json
kovan.json
morden.json
olympic.json
ropsten.json
transition_test.json	Byzantium updates (#5855)	2017-09-15 21:07:54 +02:00