Commit Graph

4 Commits (e87fdafd6258224949ab7a9bc9a8e6da3176b136)

Author SHA1 Message Date
tahaalam e87fdafd62 Merge remote-tracking branch 'origin/master' into live_activities
# Conflicts:
#	android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
#	android/app/src/main/res/values/mapbox_access_token.xml
#	android/build/reports/problems/problems-report.html
#	android/settings.gradle.kts
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/core/utils/calender_utils_new.dart
#	lib/core/utils/push_notification_handler.dart
#	lib/presentation/home/widgets/small_service_card.dart
#	lib/presentation/tele_consultation/zoom/call_screen.dart
#	lib/routes/app_routes.dart
#	lib/splashPage.dart
#	pubspec.lock
2 months ago
tahaalam 48dfddada9 live activites android and ios added. 2 months ago
aamir-csol 135b05e561 Health calculators & converters 2 months ago
haroon amjad 36bf63dcde Incoming call updates 3 months ago