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