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
Fatimah Alshammari e640f41c35 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/pharmacies/widgets/ProductOrderItem.dart
4 years ago
..
analytics merge changes-4 5 years ago
config Merge branch 'Fatima-New-Design' into 'development_new_design_2.0' 4 years ago
core fixes 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 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
pages Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
services fixes 4 years ago
theme Fixes & code optimizations 4 years ago
uitl Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
widgets Merge branch 'development_new_design_2.0' into new_design_sikander 4 years ago
Constants.dart code merged 5 years ago
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