haroon_dev #212

Merged
Haroon6138 merged 15 commits from haroon_dev into master 1 day ago

15 Commits (main)

Author SHA1 Message Date
haroon amjad 13a4c9e0f8 updates 1 day ago
haroon amjad e3f5bb69ac Updates 2 days ago
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
2 days ago
haroon amjad a9f46a39cc Updates 2 days ago
haroon amjad 92101d2b05 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/my_family/widget/family_cards.dart
2 days ago
haroon amjad 89a1da4407 Updates 2 days ago
haroon amjad 56f5151c0c Font changes, Updates & fixes 2 days ago
haroon amjad fed6cf6784 translation service changes 2 days ago
haroon amjad 453cfc07e1 Updates 2 days ago
haroon amjad 9c51f53a4d Merge branch 'master' into haroon_dev 3 days ago
haroon amjad 1fa03fff5e updates 3 days ago
haroon amjad 21477f34dc updates 3 days ago
haroon amjad 0eb9ec11d3 remote localization files added 3 days ago
haroon amjad f929bd9017 Updates 3 days ago
haroon amjad 400e5daac0 Dr Search fixed 3 days ago