2 Commits

Author	SHA1	Message	Date
Jaco Greeff	7bbd48a2bd	Merge branch 'master' into ui-2 ... # 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	2017-06-13 11:02:38 +02:00
Jaco Greeff	d91fae4e54	UI 2 tests & webpack dapp build updates/fixes (#5561) ... * Tests are executing again * Fix tests * Add missing contextTypes * IdentityIcon without Connect() * Update ~/ui tests * Update spec locations * Filename case * Fix playground dapp build	2017-05-05 15:14:05 +02:00