Oleksandr Sobol 1dff5148ff Merge branch 'newdesign' into CWA-205-update-restore-wallet-screens ... # Conflicts: # lib/src/screens/exchange/exchange_page.dart # lib/src/screens/new_wallet/new_wallet_page.dart # lib/src/screens/new_wallet/widgets/select_button.dart # lib/src/screens/rescan/rescan_page.dart # lib/src/screens/restore/restore_wallet_from_keys_page.dart # lib/src/screens/restore/restore_wallet_from_seed_details.dart # lib/src/screens/seed_language/widgets/seed_language_picker.dart # lib/src/widgets/primary_button.dart		2020-05-01 22:51:27 +03:00
..
i18n.dart	Merge branch 'newdesign' into CWA-205-update-restore-wallet-screens	2020-05-01 22:51:27 +03:00