Commit Graph

8 Commits (8b7d0d4a7e7ba2d8e8a23d2e682e987b11c75bfe)

Author SHA1 Message Date
Sultan khan 90dc8e5e05 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/core/service/client/base_app_client.dart
#	lib/main.dart
#	lib/models/LiveCare/ApplePayInsertRequest.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/gif_loader_dialog_utils.dart
#	lib/uitl/location_util.dart
#	pubspec.yaml
2 years ago
devamirsaleemahmad 3f1ba19c64 changes & Null to Dynamic 2 years ago
devamirsaleemahmad 2a4059fd66 models updates -> 3.13.6 2 years ago
haroon amjad e80ac2481a Ancillary order & manual insurance update 3 years ago
haroon amjad aae48f2555 Android permission dialog updates 4 years ago
haroon amjad 15a8e64e7c updates & fixes 5 years ago
Amjad amireh 5e50c0dc32 Blood Denote 5 years ago
Mohammad Aljammal a0300738e8 done My balance 5 years ago