# Conflicts:
#	Cargo.lock
#	ethcore/src/evm/instructions.rs
#	js/package.json
#	js/src/modals/CreateAccount/AccountDetails/accountDetails.js
#	js/src/modals/FirstRun/TnC/tnc.js
#	js/src/modals/FirstRun/Welcome/welcome.js
#	js/src/ui/Form/Input/input.js
#	js/src/views/Accounts/accounts.js
#	js/src/views/Settings/Views/defaults.js
#	js/src/views/Settings/Views/views.js
#	js/webpack/app.js
#	js/webpack/libraries.js

* Use randomized subscription ids for PubSub

* Use H64 instead of H128.

* iflet instead of match.

* Adding 0x.

darwin rustup default stable
snap - allow failure

# 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

Fixed mem write for empty slice

add --verify
add RUSTFLAGS="-C link-dead-code"

This reverts commit 6b874ced.

switch to RUST 1.18 and NodeJS 8.1

Fix JS tests

* Fix stack display.

* Additional compatiblity fixes.

* Disable UI if it's not compiled in.

* Properly enabled/disable ui server depending on features.

* Require phrase confirmation.

* Linting issues.

* Fix dialog title.

* Confirm a backup phrase.

* Confirm recovery phrase on fist run as well.

* Duration limit made optional for EthashParams

* Forgotten space added

* Update changelog for 1.6.8

* Add more changelog details for 1.6.8

* Fix date

* Replace ethcore in terms and conditions

* Replace ethcore company name in various places

* Fix casing in t&c

* Import web3Provider

* Import api

* {Transport,Provider}/Ws -> WsSecure

* PostMessage provider with filters

* PromiseWrapper -> PromiseProvider

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