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
Fatimah Alshammari a46dddea9a Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/core/model/pharmacies/order_model.dart
#	lib/pages/pharmacies/product-brands.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacy/order/Order.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/pages/pharmacy/profile/profile.dart
5 years ago
..
config fixed recommended products new design 5 years ago
core Merge branch 'development' into pharmacy-Fatima 5 years ago
generated/json Geofencing in progress 5 years ago
models Merge branch 'development' into Haroon 5 years ago
pages Merge branch 'development' into pharmacy-Fatima 5 years ago
services Merge branch 'development' into pharmacy-Fatima 5 years ago
theme Ereferral fixes, smartwatch health data integration 5 years ago
uitl Merge branch 'development' into pharmacy-Fatima 5 years ago
widgets Merge branch 'development' into pharmacy-Fatima 5 years ago
Constants.dart change color 5 years ago
d_q_icons_icons.dart no message 5 years ago
locator.dart Merge branch 'development' into pharmacy-Fatima 5 years ago
main.dart hot fixing 5 years ago
routes.dart fix merge issues 5 years ago
splashPage.dart return privilege 5 years ago