cake_wallet/macos
OmarHatem 459a40bcd9 Merge remote-tracking branch 'origin/linux/password-direct-input' into linux/password-direct-input
# Conflicts:
#	cw_bitcoin/lib/electrum_transaction_history.dart
#	lib/main.dart
#	lib/src/screens/dashboard/dashboard_page.dart
#	lib/src/screens/dashboard/desktop_widgets/desktop_dashboard_actions.dart
#	lib/src/screens/dashboard/widgets/balance_page.dart
#	lib/src/screens/dashboard/widgets/market_place_page.dart
#	lib/src/screens/dashboard/widgets/transactions_page.dart
#	lib/src/screens/ionia/cards/ionia_manage_cards_page.dart
#	lib/src/screens/receive/anonpay_invoice_page.dart
#	lib/src/screens/wallet_list/wallet_list_page.dart
#	lib/utils/responsive_layout_util.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
2023-07-13 18:59:49 +03:00
..
CakeWallet Dashboard desktop view (#737) 2023-04-14 06:39:08 +02:00
Flutter Revert "Merge branch 'linux/password-direct-input' of https://github.com/cake-tech/cake_wallet into linux/password-direct-input" 2023-06-29 16:44:31 +03:00
Runner Dashboard desktop view (#737) 2023-04-14 06:39:08 +02:00
Runner.xcodeproj Revert "Merge branch 'linux/password-direct-input' of https://github.com/cake-tech/cake_wallet into linux/password-direct-input" 2023-06-29 16:44:31 +03:00
Runner.xcworkspace Dashboard desktop view (#737) 2023-04-14 06:39:08 +02:00
.gitignore Dashboard desktop view (#737) 2023-04-14 06:39:08 +02:00
Podfile Revert "Merge branch 'linux/password-direct-input' of https://github.com/cake-tech/cake_wallet into linux/password-direct-input" 2023-06-29 16:44:31 +03:00
Podfile.lock Merge remote-tracking branch 'origin/linux/password-direct-input' into linux/password-direct-input 2023-07-13 18:59:49 +03:00