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.

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		4 years ago
..
screens	Merge branch 'development' into pharmacy-Fatima	4 years ago
widgets	added app-wide route transition animation	4 years ago
ProductCheckTypeWidget.dart	connecting pages.	4 years ago
compare-list.dart	connecting pages.	4 years ago
compare.dart	fixed issues	4 years ago
medicine_search_screen.dart	added app-wide route transition animation	4 years ago
my_reviews.dart	fix merge issues	4 years ago
pharmacies_list_screen.dart	fix LiveChatPage Service LabOrderResult MedicineSearch issues	4 years ago
product-brands.dart	Merge branch 'development' into pharmacy-Fatima	4 years ago
product_detail.dart	Merge branch 'development' into pharmacy-Fatima	4 years ago
search_brands_page.dart	connecting pages.	4 years ago
wishlist.dart	fixed issues	4 years ago