Jaco Greeff 8453dda7ef Merge branch 'master' into ui-2 ... # Conflicts: # js/package-lock.json # js/package.json # js/src/api/api.js # js/src/api/local/accounts/accounts.js # js/src/api/local/localAccountsMiddleware.js # js/src/api/local/transactions.js # js/src/api/pubsub/signer/signer.js # js/src/api/subscriptions/signer.js # js/src/api/transport/jsonRpcBase.js # js/src/api/transport/middleware.js # js/src/api/util/format.js # js/src/api/util/format.spec.js # js/src/contracts/abi/index.js # js/src/contracts/badgereg.js # js/src/dapps/tokenreg/Application/application.css # js/src/dapps/tokenreg/Application/application.js # js/src/modals/CreateWallet/WalletDetails/walletDetails.js # js/src/modals/CreateWallet/WalletDetails/walletDetails.spec.js # js/src/modals/CreateWallet/createWalletStore.js # js/src/modals/DeployContract/ParametersStep/parametersStep.js # js/src/modals/DeployContract/deployContract.js # js/src/modals/ExecuteContract/DetailsStep/detailsStep.js # js/src/modals/WalletSettings/walletSettings.js # js/src/redux/providers/certifications/actions.js # js/src/redux/providers/certifications/middleware.js # js/src/redux/providers/certifications/reducer.js # js/src/redux/providers/requestsActions.js # js/src/redux/providers/tokensActions.js # js/src/ui/AccountCard/accountCard.css # js/src/ui/Balance/balance.js # js/src/ui/Balance/balance.spec.js # js/src/ui/DappCard/dappCard.js # js/src/ui/Form/AddressSelect/addressSelect.js # js/src/ui/Form/AddressSelect/addressSelectStore.js # js/src/ui/Form/InputAddressSelect/inputAddressSelect.js # js/src/ui/Form/TypedInput/typedInput.js # js/src/ui/IdentityIcon/identityIcon.js # js/src/ui/MethodDecoding/tokenValue.js # js/src/util/tx.js # js/src/util/wallets.js # js/src/util/wallets/consensys-wallet.js # js/src/util/wallets/foundation-wallet.js # js/src/views/Account/account.js # js/src/views/Accounts/List/list.js # js/src/views/Contract/Queries/inputQuery.js # js/src/views/Contract/Queries/queries.js # js/src/views/Contract/contract.js # js/src/views/Signer/components/SignRequest/signRequest.css # js/src/views/Signer/components/SignRequest/signRequest.js # js/src/views/Signer/components/SignRequest/signRequest.spec.js		2017-10-16 12:41:41 +02:00
..
benches	Fixes bench and removes rustc_serialize dependency (#5988)	2017-10-11 17:39:12 +07:00
evm	removed redundant evm deps (#6757)	2017-10-14 19:29:09 +02:00
light	v1.9.0 (#6727)	2017-10-12 23:44:02 +02:00
native_contracts	Update jsonrpc dependencies and rewrite dapps to futures. (#6522)	2017-10-05 12:35:01 +02:00
node_filter	v1.9.0 (#6727)	2017-10-12 23:44:02 +02:00
res	Merge branch 'master' into ui-2	2017-10-16 12:41:41 +02:00
src	Removes redundant mut in ethcore	2017-10-15 20:10:20 +07:00
types	Add pagination for trace_filter rpc method (#6312)	2017-10-03 10:03:46 +02:00
vm	removed redundant evm deps (#6757)	2017-10-14 19:29:09 +02:00
wasm	WASM gas schedule (#6638)	2017-10-09 13:12:58 +02:00
build.rs	Ethcore crate split part 1 (#6041)	2017-07-12 13:09:17 +02:00
Cargo.toml	v1.9.0 (#6727)	2017-10-12 23:44:02 +02:00