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
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
3 weeks ago
..
core Merge remote-tracking branch 'origin/master' into live_activities 3 weeks ago
extensions Monthly Reports implemented 4 weeks ago
features Merge remote-tracking branch 'origin/master' into ambulance_service 4 weeks ago
generated sorting done, covid inprogress 1 month ago
presentation Merge remote-tracking branch 'origin/master' into live_activities 3 weeks ago
routes live activites android and ios added. 1 month ago
services Added Graph 1 month ago
theme Merge branch 'master' into faiz_dev 1 month ago
widgets Monthly Reports implemented 4 weeks ago
firebase_options.dart initial commit 5 months ago
main.dart Monthly Reports implemented 4 weeks ago
splashPage.dart live activites android and ios added. 1 month ago