mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2024-12-29 06:59:30 +00:00
9fbb206a7c
Conflicts: .gitignore assets/text/Monerocom_Release_Notes.txt assets/text/Release_Notes.txt cw_bitcoin/lib/bitcoin_wallet_service.dart cw_bitcoin/lib/electrum_transaction_history.dart cw_bitcoin/lib/litecoin_wallet_service.dart cw_bitcoin/pubspec.yaml cw_core/pubspec.lock cw_monero/ios/Classes/monero_api.cpp cw_monero/lib/monero_wallet.dart cw_monero/lib/monero_wallet_service.dart lib/core/backup_service.dart lib/core/wallet_loading_service.dart lib/di.dart lib/entities/default_settings_migration.dart lib/entities/get_encryption_key.dart lib/entities/main_actions.dart lib/main.dart lib/router.dart lib/src/screens/dashboard/desktop_widgets/desktop_action_button.dart lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart lib/src/screens/dashboard/widgets/market_place_page.dart lib/src/screens/dashboard/widgets/transactions_page.dart lib/src/screens/receive/anonpay_invoice_page.dart lib/src/screens/restore/wallet_restore_from_keys_form.dart lib/src/screens/restore/wallet_restore_page.dart lib/src/screens/settings/security_backup_page.dart lib/src/screens/wallet/wallet_edit_page.dart lib/src/screens/wallet_list/wallet_list_page.dart lib/store/settings_store.dart lib/utils/distribution_info.dart lib/view_model/wallet_creation_vm.dart lib/view_model/wallet_list/wallet_edit_view_model.dart lib/view_model/wallet_list/wallet_list_view_model.dart lib/view_model/wallet_new_vm.dart res/values/strings_ar.arb res/values/strings_bg.arb res/values/strings_cs.arb res/values/strings_de.arb res/values/strings_en.arb res/values/strings_es.arb res/values/strings_fr.arb res/values/strings_ha.arb res/values/strings_hi.arb res/values/strings_hr.arb res/values/strings_id.arb res/values/strings_it.arb res/values/strings_ja.arb res/values/strings_ko.arb res/values/strings_my.arb res/values/strings_nl.arb res/values/strings_pl.arb res/values/strings_pt.arb res/values/strings_ru.arb res/values/strings_th.arb res/values/strings_tr.arb res/values/strings_uk.arb res/values/strings_ur.arb res/values/strings_yo.arb res/values/strings_zh.arb scripts/android/app_env.sh scripts/ios/app_env.sh scripts/macos/app_env.sh tool/configure.dart |
||
---|---|---|
.. | ||
wallet_edit_view_model.dart | ||
wallet_list_item.dart | ||
wallet_list_view_model.dart |