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/lib
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
..
analytics changes 2 years ago
app_state
config Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6 2 years ago
core Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6 2 years ago
extensions models updates -> 3.13.6 2 years ago
generated/json models updates -> 3.13.6 2 years ago
models Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6 2 years ago
pages Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6 2 years ago
services Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6 2 years ago
theme theme change 2 years ago
uitl Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6 2 years ago
widgets Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6 2 years ago
Constants.dart models updates -> 3.13.6 2 years ago
d_q_icons_icons.dart changes & Null to Dynamic 2 years ago
firebase_options.dart
locator.dart
main.dart Calender Permission Fix Ios 17+ 2 years ago
routes.dart file updated 2 years ago
splashPage.dart payment fix 2 years ago