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.

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		3 years ago
..
confirm-login.dart	blood type changes	3 years ago
forgot-password.dart	Revert "Merge branch 'foote_in_all_pages' into 'development'"	3 years ago
login-type.dart	FAMILY FILES	3 years ago
login.dart	Merge branch 'development' into development_new_design_2.0	3 years ago
register-info.dart	Imports organized	3 years ago
register.dart	family file fixes	3 years ago
welcome.dart	Updates & fixes	3 years ago