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
mosazaid 38d58ebaaf Merge branch 'pharmacy' into pharmacy_mosa_branch
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
#	lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
#	lib/services/pharmacy_services/pharmacyAddress_service.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
..
config Merge branch 'pharmacy' into pharmacy_mosa_branch 5 years ago
core Merge branch 'pharmacy' into pharmacy_mosa_branch 5 years ago
models connecting pages. 5 years ago
pages Merge branch 'pharmacy' into pharmacy_mosa_branch 5 years ago
services Merge branch 'pharmacy' into pharmacy_mosa_branch 5 years ago
theme Ereferral fixes, smartwatch health data integration 5 years ago
uitl Merge branch 'pharmacy' into pharmacy_mosa_branch 5 years ago
widgets Merge branch 'pharmacy' into pharmacy_mosa_branch 5 years ago
d_q_icons_icons.dart working on pharmacy home page 5 years ago
locator.dart Merge branch 'pharmacy' into enad_pharmacy2 5 years ago
main.dart connecting pages. 5 years ago
routes.dart Version Control finished 5 years ago
splashPage.dart fix issues 5 years ago