3 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	368e3d1f51	Merge branch 'master' into ui-2	2017-05-22 11:50:15 +02:00
Jaco Greeff	4c28ef40b7	Ui 2 shared package (redux, mobx, utils) (#5579) ... * Create @parity/shared * Move ~/util to shared/util * Move ~/contracts to shared/contracts * Move ~/config to shared/config * Move ~/environment to shared/environment * Updated paths * Move ~/mobx to shared/mobx * Move ~/redux to shared/redux * Add shared to test babel compile	2017-05-09 12:01:44 +02:00