dev_aamir #118

Merged
Haroon6138 merged 2 commits from dev_aamir into master 1 month ago

2 Commits (main)

Author SHA1 Message Date
aamir-csol 7d71d994ea Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/enums.dart
#	lib/core/utils/calender_utils_new.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/hmg_services/services_view.dart
#	lib/routes/app_routes.dart
1 month ago
aamir-csol 335e6a6649 Health Calculators 1 month ago