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

..

benches

Byzantium updates (#5855)

2017-09-15 21:07:54 +02:00

evm

Byzantium updates (#5855)

2017-09-15 21:07:54 +02:00

light

Byzantium updates (#5855)

2017-09-15 21:07:54 +02:00

native_contracts

Transaction permissioning (#6441)

2017-09-05 10:39:50 +01:00

node_filter

separate trie from util and make its dependencies into libs:

2017-09-15 11:03:53 +08:00

res

Merge branch 'master' into ui-2

2017-09-18 11:44:09 +02:00

src

Byzantium updates (#5855)

2017-09-15 21:07:54 +02:00

types

Byzantium updates (#5855)

2017-09-15 21:07:54 +02:00

vm

Byzantium updates (#5855)

2017-09-15 21:07:54 +02:00

wasm

Byzantium updates (#5855)

2017-09-15 21:07:54 +02:00

build.rs

Ethcore crate split part 1 (#6041)

2017-07-12 13:09:17 +02:00

Cargo.toml

rename trie to patricia-trie

2017-09-15 11:49:26 +08:00