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.
HMG_Patient_App/lib
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
5 years ago
..
config Merge branch 'development' into Haroon 5 years ago
core Merge branch 'development' into fix_design 5 years ago
generated/json Geofencing in progress 5 years ago
models Merge branch 'development' into Haroon 5 years ago
pages Merge branch 'development' into Haroon 5 years ago
services Merge branch 'development' into Haroon 5 years ago
theme Ereferral fixes, smartwatch health data integration 5 years ago
uitl Merge branch 'development' into fix_design 5 years ago
widgets Merge branch 'development' into ZohaibIqbalKambrani 5 years ago
Constants.dart change color 5 years ago
d_q_icons_icons.dart no message 5 years ago
locator.dart Merge branch 'development' into fix_design 5 years ago
main.dart hot fixing 5 years ago
routes.dart fix merge issues 5 years ago
splashPage.dart return privilege 5 years ago