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.

hussam al-habibeh 1a382bfc80 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix ... Conflicts: lib/config/config.dart lib/pages/parent_categorise_page.dart lib/pages/pharmacies/screens/cart-page/cart-order-page.dart lib/pages/pharmacies/screens/product-details/product-detail.dart lib/pages/sub_categorise_page.dart		5 years ago
..
screens	…
widgets	…
ProductCheckTypeWidget.dart	…
compare-list.dart	…
compare.dart	…
medicine_search_screen.dart	…
my_reviews.dart	…
pharmacies_list_screen.dart	…
product-brands.dart	…
search_brands_page.dart	…
wishlist.dart	…