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/services
haroon amjad 925e3cb686 Merge branch 'development' into haroon-new-design
# Conflicts:
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/landing_page_pharmcy.dart
#	lib/pages/login/login.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/screens/product-details/product-detail.dart
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/pharmacy/profile/profile.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
3 years ago
..
appointment_services updates & fixes 3 years ago
authentication registration done 3 years ago
clinic_services Calendar plugin changed 3 years ago
covid-drivethru Updates & fixes 3 years ago
family_files Family files fixes 3 years ago
livecare_services LiveCare Schedule fixes 3 years ago
my_invoice_service updates & fixes 3 years ago
permission merge changes-3 3 years ago
pharmacy_services Merge branch 'development' into haroon-new-design 3 years ago
robo_search voice command 4 years ago
smartwatch_integration Body added 3 years ago