Commit Graph

8 Commits (f52aed49fd124e185ffdfd58bb9bc4d37b52bc31)

Author SHA1 Message Date
Aamir Muhammad 77651f9652 Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/insurance/AttachInsuranceCardImageDialog.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/paymentService/payment_service.dart
#	lib/uitl/push-notification-handler.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/uitl/utils_new.dart
#	lib/widgets/avatar/large_avatar.dart
#	lib/widgets/bottom_navigation/bottom_navigation_item.dart
#	lib/widgets/bottom_options/BottomSheet.dart
#	lib/widgets/data_display/medical/medical_profile_item.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	pubspec.yaml
2 years ago
devamirsaleemahmad cb56750e6b models updates -> 3.13.6 2 years ago
haroon amjad 128bd2ec54 Inpatient services implementation 3 years ago
haroon amjad 40d649dfa4 Updates & fixes 4 years ago
Zohaib Kambrani 8457972fda no message 5 years ago
Zohaib Kambrani 92ba977fca no message 5 years ago
Zohaib Kambrani c10d024700 no message 5 years ago
Zohaib Kambrani 8d5d55a150 Geofencing in progress 5 years ago