dev_aamir #166

Merged
Haroon6138 merged 7 commits from dev_aamir into master 3 days ago

7 Commits (main)

Author SHA1 Message Date
aamir-csol 2bbfe1f131 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/profile_settings/profile_settings.dart
3 days ago
aamir-csol 8b701255ed logout & family file fix 3 days ago
aamir-csol 418297b6fb Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
6 days ago
aamir-csol bb72c7f7d6 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
#	lib/presentation/hmg_services/services_page.dart
#	pubspec.lock
1 week ago
aamir-csol 0017c0601b blood donation changes 1 week ago
aamir-csol a816afadea Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/hmg_services/services_page.dart
2 weeks ago
aamir-csol d76ff5828f fixes 2 weeks ago