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_New/lib
haroon amjad 081dfce480 Merge branch 'master' into haroon_dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
#	lib/presentation/emergency_services/widgets/location_input_bottom_sheet.dart
#	lib/widgets/input_widget.dart
23 hours ago
..
core Merge branch 'master' into haroon_dev 23 hours ago
extensions WD:map issues resolved: 23 hours ago
features Merge branch 'master' into haroon_dev 23 hours ago
generated Merge branch 'master' into haroon_dev 23 hours ago
presentation Merge branch 'master' into haroon_dev 23 hours ago
routes Merge remote-tracking branch 'origin/master' into watch_integration 4 weeks ago
services Updates 3 days ago
theme Font changes, Updates & fixes 1 day ago
widgets Merge branch 'master' into haroon_dev 23 hours ago
firebase_options.dart Android package name updated to new package details 2 months ago
main.dart Font changes, Updates & fixes 1 day ago
splashPage.dart Merge remote-tracking branch 'origin/master' into watch_integration 3 weeks ago