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
Zohaib Iqbal Kambrani dc83b476d6 Merge branch 'development' into ZohaibIqbalKambrani
# Conflicts:
#	android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt
#	ios/Flutter/.last_build_id
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/widgets/drawer/app_drawer_widget.dart
5 years ago
..
config Merge branch 'development' into ZohaibIqbalKambrani 5 years ago
core fix merge issues 5 years ago
generated/json Geofencing in progress 5 years ago
models fix merge issues 5 years ago
pages Merge branch 'development' into ZohaibIqbalKambrani 5 years ago
services Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge 5 years ago
theme Ereferral fixes, smartwatch health data integration 5 years ago
uitl Merge branch 'development' into ZohaibIqbalKambrani 5 years ago
widgets Merge branch 'development' into ZohaibIqbalKambrani 5 years ago
Constants.dart change color 5 years ago
d_q_icons_icons.dart no message 5 years ago
locator.dart fix merge issues 5 years ago
main.dart Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge 5 years ago
routes.dart fix merge issues 5 years ago
splashPage.dart return privilege 5 years ago