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.
HMG_Patient_App_New/lib/core
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
..
api updates 3 months ago
common_models Merge remote-tracking branch 'origin/master' into live_activities 2 months ago
exceptions Health calculators & converters 3 months ago
utils Merge remote-tracking branch 'origin/master' into live_activities 2 months ago
api_consts.dart updates 3 months ago
app_assets.dart Bottom nav updates 3 months ago
app_export.dart family screen add fixes & remove & switch & widgets 5 months ago
app_state.dart Merge branch 'master' into dev_aamir 3 months ago
cache_consts.dart Monthly Reports implemented 3 months ago
dependencies.dart Monthly Reports implemented 3 months ago
enums.dart Health calculators & converters 3 months ago
firebase_message.dart notification handler 2 months ago
location_util.dart Added Graph 3 months ago
post_params_model.dart Added Graph 3 months ago