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.
diplomatic-quarter/lib/widgets
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
..
Loader Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
app_map updated with assets 2 years ago
avatar null safety fixed. 2 years ago
bottom_navigation Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
bottom_options Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6 2 years ago
buttons Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6 2 years ago
card
carousel_indicator
charts changes & Deletion 2 years ago
data_display Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
dialogs Merge branch 'development_v3.3' into dev_v3.13.6 2 years ago
drawer Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
errors
in_app_browser Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
input changes 2 years ago
loadings
mobile-no
new_design Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
nfc updates 2 years ago
offers_packages Changes into Rating Bar 2 years ago
others merge with 3.3 2 years ago
otp Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
pharmacy Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
pickupLocation
progress_indicator
text
transitions
typewriter
weather_slider
AnimatedTextFields.dart
CounterView.dart
LoadingButton.dart
TextFieldInertiaDirection.java
dragable_sheet.dart
habib_logo_widget.dart
hospital_location.dart updates 2 years ago
my_rich_text.dart
otp_widget.dart changes 2 years ago
photo_view_page.dart
show_zoom_image_dialog.dart
single_selection_dialog.dart