Jaco Greeff 602115d81e Merge branch 'master' into ui-2 ... # Conflicts: # js/src/shell/Connection/connection.js # js/src/ui/Icons/index.js # js/src/views/Accounts/CreateAccount/RecoveryPhrase/recoveryPhrase.js		2017-05-19 14:55:13 +02:00
..
CreateAccount	Merge branch 'master' into ui-2	2017-05-19 14:55:13 +02:00
CreateWallet	Merge branch 'master' into ui-2	2017-05-16 17:03:17 +02:00
ExportAccount	Ui 2 radios & imports (#5609)	2017-05-12 12:06:16 +02:00
List	Ui 2 radios & imports (#5609)	2017-05-12 12:06:16 +02:00
Summary	Ui 2 radios & imports (#5609)	2017-05-12 12:06:16 +02:00
accounts.css	Ui 2 depends & fixes (#5590)	2017-05-10 13:23:14 +02:00
accounts.js	Merge branch 'master' into ui-2	2017-05-19 14:55:13 +02:00
accounts.spec.js	UI 2 tests & webpack dapp build updates/fixes (#5561)	2017-05-05 15:14:05 +02:00
index.js	Ui 2 complete MUI removal (#5635)	2017-05-16 14:46:48 +02:00
package.json	Navigate to dapp from dapp (WIP)	2017-04-24 17:41:47 +02:00
parity.js	Accounts as dapp	2017-04-24 12:45:01 +02:00