Bogdan Kotikov 741199d84d Merge remote-tracking branch 'origin/main' into feature/optimize-search-page ... # Conflicts: # .dart_tool/package_config.json # .dart_tool/package_config_subset # .flutter-plugins-dependencies # lib/android/pages/nav_pages/main_page.dart # pubspec.yaml		2023-06-03 00:48:17 +02:00
..
nav_pages	Merge remote-tracking branch 'origin/main' into feature/optimize-search-page	2023-06-03 00:48:17 +02:00
settings.dart	settings page	2023-06-03 00:40:40 +02:00
welcome.dart	settings page	2023-06-03 00:40:40 +02:00