julian 056fa1947c Merge remote-tracking branch 'origin/staging' into add-ethereum ... # Conflicts: # lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart # lib/pages/wallet_view/sub_widgets/wallet_navigation_bar.dart # lib/pages/wallet_view/wallet_view.dart # lib/services/price.dart # lib/utilities/assets.dart # pubspec.lock # pubspec.yaml		2023-02-14 08:24:04 -06:00
..
db	adjust maxSizeMiB for isar instances	2023-02-10 18:41:21 -06:00
electrumx_rpc	handle dropped mempool/blockchain transactions	2023-01-27 12:49:25 -06:00
exceptions	show unsupported pair message per exchange	2023-02-06 12:19:43 -06:00
hive	Merge remote-tracking branch 'cypherstack/ui-fixes' into simplex	2023-01-24 12:29:13 -06:00
models	Merge remote-tracking branch 'origin/staging' into add-ethereum	2023-02-14 08:24:04 -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-02-14 08:24:04 -06:00
pages_desktop_specific	Merge remote-tracking branch 'origin/ui-fixes' into paynyms	2023-02-13 17:24:04 -06:00
providers	clean up exchange rate type enum, build runner mocks	2023-02-08 16:46:30 -06:00
services	Merge remote-tracking branch 'origin/staging' into add-ethereum	2023-02-14 08:24:04 -06:00
utilities	Merge remote-tracking branch 'origin/staging' into add-ethereum	2023-02-14 08:24:04 -06:00
widgets	show forest background fix	2023-02-13 16:09:12 -06:00
main.dart	only delete logs older than 30 days automatically	2023-02-13 15:08:38 -06:00
route_generator.dart	Merge remote-tracking branch 'origin/staging' into add-ethereum	2023-02-14 08:24:04 -06:00