julian
|
c87564e1cd
|
Merge remote-tracking branch 'origin/monerodart_testing' into monero_merge
# Conflicts:
# .gitignore
# crypto_plugins/flutter_libmonero
# lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart
# lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart
# lib/pages_desktop_specific/settings/settings_menu/nodes_settings.dart
# lib/utilities/constants.dart
# lib/wallets/crypto_currency/coins/monero.dart
# lib/wallets/wallet/impl/monero_wallet.dart
# lib/wallets/wallet/impl/wownero_wallet.dart
# scripts/app_config/templates/pubspec.template
# scripts/linux/build_all.sh
# scripts/windows/build_all.sh
|
2024-05-27 10:41:50 -06:00 |
|
