aamir-csol
|
f91f8e63d7
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
# lib/presentation/medical_file/widgets/lab_rad_card.dart
|
2 months ago |
aamir-csol
|
d256eec392
|
medical file changes
|
2 months ago |
aamir-csol
|
19365375f6
|
medical file changes
|
2 months ago |
aamir-csol
|
0f17a655ed
|
Merge branch 'master' into dev_aamir
# Conflicts:
# ios/Runner/AppDelegate.swift
# lib/core/dependencies.dart
# lib/core/utils/utils.dart
# lib/features/emergency_services/emergency_services_view_model.dart
# lib/presentation/authentication/quick_login.dart
# lib/presentation/emergency_services/RRT/rrt_request_type_select.dart
# lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
# lib/presentation/emergency_services/call_ambulance/requesting_services_page.dart
# lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
# lib/presentation/emergency_services/emergency_services_page.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/presentation/my_family/widget/family_cards.dart
# lib/widgets/appbar/collapsing_list_view.dart
# lib/widgets/common_bottom_sheet.dart
|
2 months ago |
aamir-csol
|
e113c4c1ee
|
updates & fixes & RRT Flow
|
3 months ago |
aamir-csol
|
3e5c3a3a27
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
|
4 months ago |
aamir-csol
|
8123981092
|
Merge branch 'master' into dev_aamir
|
4 months ago |
aamir-csol
|
987fe73128
|
family screen add fixes & remove & switch & widgets
|
4 months ago |
aamir-csol
|
6f01f92dd0
|
Merge remote-tracking branch 'origin/faiz_dev' into dev_aamir
|
4 months ago |
aamir-csol
|
02ae79c458
|
Merge branch 'refs/heads/master' into dev_aamir
|
4 months ago |
aamir-csol
|
58e65e7a64
|
Merge branch 'master' into dev_aamir
|
4 months ago |
aamir-csol
|
cd81372fc6
|
family screen add fixes & remove & switch & widgets
|
4 months ago |