# Conflicts:
#	js/package.json
#	js/src/api/local/ethkey/worker.js
#	js/src/modals/FirstRun/TnC/tnc.js
#	js/src/modals/FirstRun/Welcome/welcome.js
#	js/src/ui/Form/Input/input.js
#	js/src/ui/VaultCard/Accounts/accounts.spec.js
#	js/src/views/Accounts/accounts.js
#	js/src/views/Application/TabBar/tabBar.js
#	js/src/views/Settings/Views/defaults.js
#	js/src/views/Settings/Views/views.js
#	js/webpack/app.js
#	js/webpack/libraries.js

* Import web3Provider

* Import api

* {Transport,Provider}/Ws -> WsSecure

* PostMessage provider with filters

* PromiseWrapper -> PromiseProvider

# Conflicts:
#	js/src/ui/Balance/balance.js

update the source for the snapcraft package

Jaco Greeff authored Jun 07, 2017 and Arkadiy Paronyan committed Jun 07, 2017

* Additional non-empty phrase check (fromNew)

* Explicit canCreate check in create (not only on UI)

* BN instance check (fixes Geth imports)

* Fixup tests after better checks

* PR comments (Thanks @tomusdrw )

* Typo

Tomasz Drwięga authored Jun 07, 2017 and Arkadiy Paronyan committed Jun 07, 2017

* Updating ring,multihash,tiny-keccak

* Updating CID in ipfs.

* EIP-211

* Optimized memory usage

* Optimized truncation

add snap build to tags, triggers

* Bump mio

* Fixed warnings

* Update mio to crates.

add rust beta&nigthly test for master
add more triggers

* Self-sufficient secureApi.

* Updating embed.

* Linting issues.

create snapcraft.yaml  for snapcraft.io

* Add providers

* Convert rpc calls to use provider

* Update SecureApi for provider

* add a simple test for is_push so that every small utility has a corresponding unit test

* split evm/factory.rs into two files as the TODO suggests

* style fixes according to review comments

* Add dev chain to isTest

* Fix signer

* Fix no condfition transactions

* Fix case : old parity

* Fix propTypes.

* Fix new origin shape

* Pass input types through (<input /> tag)

* Update build

* EIP-210

* comment

# Conflicts:
#	js/src/modals/FirstRun/Welcome/welcome.js

fixes typo

* Fixed --datadir

* Removed evmbin lib