You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

haroon amjad 6945230965 Merge branch 'development' into Haroon ... # Conflicts: # lib/config/config.dart # lib/config/localized_values.dart # lib/pages/Covid-DriveThru/covid-drivethru-location.dart # lib/pages/landing/home_page.dart # lib/pages/medical/smart_watch_health_data/health_data_list.dart # lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart # lib/uitl/translations_delegate_base.dart # pubspec.yaml		4 years ago
..
Covid-TimeSlots.dart	Merge branch 'development' into Haroon	4 years ago
covid-drivethru-location.dart	Merge branch 'master' into Haroon	4 years ago
covid-payment-alert.dart	covid drivethru implemented	4 years ago
covid-payment-details.dart	covid drivethru implemented	4 years ago