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.
PatientApp-KKUMC/lib
Mohammad Aljammal 9dfd8a71dc Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges
 Conflicts:
	lib/locator.dart
	lib/pages/DrawerPages/family/my-family.dart
	lib/pages/login/confirm-login.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/reports/report_home_page.dart
	lib/widgets/bottom_navigation/bottom_nav_bar.dart
	lib/widgets/drawer/app_drawer_widget.dart
5 years ago
..
config Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges 5 years ago
core Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges 5 years ago
models Revert "Merge branch 'pharmacy-hussam' into 'master'" 5 years ago
pages Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges 5 years ago
services Revert "Merge branch 'pharmacy-hussam' into 'master'" 5 years ago
theme Ereferral fixes, smartwatch health data integration 5 years ago
uitl Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges 5 years ago
widgets Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges 5 years ago
d_q_icons_icons.dart
locator.dart Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges 5 years ago
main.dart Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
routes.dart fix merge issues 5 years ago
splashPage.dart remove load user from SplashScreen 5 years ago