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
Sikander Saleem 706832a1cb Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/locator.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/product_detail.dart
#	lib/pages/pharmacies/screens/cart-order-preview.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/widgets/ProductTileItem.dart
#	lib/pages/search_products_page.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/buttons/secondary_button.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/others/app_scafold_detail_page.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
4 years ago
..
analytics merge changes-4 5 years ago
config Merge branch 'development' into development_new_design_2.0 4 years ago
core Merge branch 'development' into development_new_design_2.0 4 years ago
extensions Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
generated/json Imports organized 4 years ago
models UI fixes & updates 4 years ago
pages Merge branch 'development' into development_new_design_2.0 4 years ago
services Merge branch 'development' into development_new_design_2.0 4 years ago
theme Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
uitl Merge branch 'development' into development_new_design_2.0 4 years ago
widgets Merge branch 'development' into development_new_design_2.0 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 Merge branch 'development' into development_new_design_2.0 4 years ago
main.dart Merge branch 'development' into development_new_design_2.0 4 years ago
routes.dart Imports organized 4 years ago
splashPage.dart Merge branch 'new_design_sikander' into development_new_design_2.0 5 years ago