Anthony 15b076fd20 fix merge conflicts		2021-08-19 22:18:54 +02:00
..
index.js	Move transactions from Settings to Wallet (#6871)	2021-08-13 13:59:43 -04:00
view.jsx	fix merge conflicts	2021-08-19 22:18:54 +02:00