Jaco Greeff 31be9d25f3 Merge branch 'master' into ui-2 ... # Conflicts: # js/src/shell/Signer/components/TransactionPendingFormConfirm/transaction PendingFormConfirm.js # js/src/ui/Container/Title/title.js # js/src/views/Application/Snackbar/snackbar.js # js/src/views/Status/Peers/peers.js		2017-05-16 13:30:19 +02:00
..
Title	Merge branch 'master' into ui-2	2017-05-16 13:30:19 +02:00
container.css	UI 2 Status dapp fixes (#5531)	2017-05-02 11:14:18 +02:00
container.js	Remove Card completely	2017-05-09 14:04:58 +02:00
container.spec.js	Fix tests	2017-05-10 14:31:55 +02:00
index.js	Fix whitespace (#4299)	2017-01-25 18:51:41 +01:00