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.

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		11 months ago
..
BottomButton.dart	file updated	1 year ago
GestureIconButton.dart	file updated	1 year ago
borderedButton.dart	file updated	1 year ago
button.dart	file updated	1 year ago
custom_text_button.dart	file updated	1 year ago
defaultButton.dart	Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6	11 months ago
floatingActionButton.dart	file updated	1 year ago
mini_button.dart	code update in progress	1 year ago
secondary_button.dart	code update in progress	1 year ago