Merge branch 'master' into ui-2
# 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
Please register or sign in to comment