Commit Graph

5 Commits (f52aed49fd124e185ffdfd58bb9bc4d37b52bc31)

Author SHA1 Message Date
Sultan khan c9be715436 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/Blood/blood_donation.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
2 years ago
haroon amjad 69e64fd5fb Blood Donation CR merged into dev_3.3 2 years ago
devamirsaleemahmad e8e7a726f5 updates -> 3.13.6 2 years ago
Amjad amireh a00b3a133c Blood Denote 5 years ago
Amjad amireh 5e50c0dc32 Blood Denote 5 years ago