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 |
|