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
Mohammad Aljammal 16d1f667d4 Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_merge
 Conflicts:
	android/app/build.gradle
	lib/config/config.dart
	lib/pages/pharmacy/profile/profile.dart
	lib/widgets/pharmacy/product_tile.dart
5 years ago
..
config Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_merge 5 years ago
core Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_merge 5 years ago
models connecting pages. 5 years ago
pages Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_merge 5 years ago
services Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_merge 5 years ago
theme Ereferral fixes, smartwatch health data integration 5 years ago
uitl Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_merge 5 years ago
widgets Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_merge 5 years ago
d_q_icons_icons.dart working on pharmacy home page 5 years ago
locator.dart Merge branch 'pharmacy' into pharmacy-Fatima 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