haroon_dev #156

Merged
Haroon6138 merged 11 commits from haroon_dev into master 2 days ago

11 Commits (main)

Author SHA1 Message Date
haroon amjad a0008c9104 Nearest Appointment sorting fixed 2 days ago
haroon amjad 475a9b9acb Merge branch 'master' into haroon_dev 2 days ago
haroon amjad 609ae6ab83 updates 3 days ago
haroon amjad 344adf23c0 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/landing_page.dart
3 days ago
haroon amjad 44ce353dac updates 3 days ago
haroon amjad fc750174fe Merge branch 'master' into haroon_dev 3 days ago
haroon amjad d848291930 updates 3 days ago
haroon amjad e454c9c991 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
3 days ago
haroon amjad 91c16f13d1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
3 days ago
haroon amjad 1c0842ab95 updates 3 days ago
haroon amjad 02930a901e Indoor navigation implementation & Landing page swiper card updates 1 week ago