julian 702054ac61 Merge remote-tracking branch 'origin/staging' into add-ethereum ... # Conflicts: # assets/svg/themed/forest/ethereum.png # assets/svg/themed/forest/ethereum.svg # lib/pages/add_wallet_views/create_or_restore_wallet_view/create_or_restore_wallet_view.dart # lib/pages/receive_view/addresses/edit_address_label_view.dart # lib/pages/receive_view/addresses/receiving_addresses_view.dart # lib/pages/wallet_view/sub_widgets/wallet_navigation_bar.dart # lib/pages/wallet_view/wallet_view.dart # lib/route_generator.dart # lib/utilities/assets.dart # lib/utilities/constants.dart # lib/widgets/animated_widgets/rotate_icon.dart # pubspec.lock # pubspec.yaml		2023-03-22 08:54:25 -06:00
..
db	Merge remote-tracking branch 'origin/staging' into add-ethereum	2023-03-22 08:54:25 -06:00
dto/ethereum	parse eth tx json to data transfer objects	2023-03-02 15:07:25 -06:00
electrumx_rpc	project structure	2023-03-01 15:52:13 -06:00
exceptions	MB doesn't store trade/order history indefinitely	2023-03-06 13:59:30 -06:00
models	Merge remote-tracking branch 'origin/staging' into add-ethereum	2023-03-22 08:54:25 -06:00
notifications	include flushbartype in flushbar import	2022-11-18 10:22:43 -06:00
pages	Merge remote-tracking branch 'origin/staging' into add-ethereum	2023-03-22 08:54:25 -06:00
pages_desktop_specific	Merge remote-tracking branch 'origin/staging' into add-ethereum	2023-03-22 08:54:25 -06:00
providers	Merge remote-tracking branch 'origin/staging' into add-ethereum	2023-03-22 08:54:25 -06:00
services	Merge remote-tracking branch 'origin/staging' into add-ethereum	2023-03-22 08:54:25 -06:00
utilities	Merge remote-tracking branch 'origin/staging' into add-ethereum	2023-03-22 08:54:25 -06:00
widgets	Merge remote-tracking branch 'origin/staging' into add-ethereum	2023-03-22 08:54:25 -06:00
main.dart	Merge remote-tracking branch 'origin/staging' into add-ethereum	2023-03-22 08:54:25 -06:00
route_generator.dart	Merge remote-tracking branch 'origin/staging' into add-ethereum	2023-03-22 08:54:25 -06:00