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.
HMG_Patient_App/lib
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
4 years ago
..
analytics merge changes-4 5 years ago
config Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
core Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
extensions Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
generated/json Offers & discounts UI updating 4 years ago
models Family files API changes 4 years ago
pages Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
services Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
theme Fixes & code optimizations 4 years ago
uitl fix bottom bar in cart page 4 years ago
widgets Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
Constants.dart
d_q_icons_icons.dart add pharmacy icons for bottom nav 4 years ago
locator.dart pharmacy home page update 4 years ago
main.dart Merge branch 'development' into haroon-new-design 4 years ago
routes.dart pharmacy fixes 4 years ago
splashPage.dart Merge branch 'new_design_sikander' into development_new_design_2.0 5 years ago