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
..
Peer	Ui 2 radios & imports (#5609)	2017-05-12 12:06:16 +02:00
index.js	Cleanup the Status View (#5317)	2017-03-29 14:38:07 +02:00
peers.css	Add peer management to the Status tab (#5566)	2017-05-16 11:01:55 +01:00
peers.js	Merge branch 'master' into ui-2	2017-05-16 13:30:19 +02:00