Fatimah.Alshammari
|
89ff10f506
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
# lib/theme/colors.dart
|
1 week ago |
Fatimah.Alshammari
|
8191852f4d
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
|
2 weeks ago |
Fatimah.Alshammari
|
e17d3cde87
|
fix toggle
|
2 weeks ago |
Fatimah.Alshammari
|
77242825bb
|
fix toggle
|
2 weeks ago |
Fatimah.Alshammari
|
27ad4e0764
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/utils/utils.dart
# lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
# lib/presentation/home/landing_page.dart
|
2 weeks ago |
Fatimah.Alshammari
|
eae16eec44
|
active medication
|
2 weeks ago |
Fatimah.Alshammari
|
3f123d12d6
|
Merge remote-tracking branch 'refs/remotes/origin/master' into fatima
# Conflicts:
# lib/core/api_consts.dart
# lib/core/utils/utils.dart
# lib/main.dart
|
1 month ago |
Fatimah.Alshammari
|
de8c7bc605
|
active medication
|
1 month ago |
Fatimah.Alshammari
|
cb56503622
|
Merge remote-tracking branch 'refs/remotes/origin/master' into fatima
|
2 months ago |
Fatimah.Alshammari
|
e8319a0d3f
|
active medication
|
2 months ago |