haroon_dev #28

Merged
Haroon6138 merged 12 commits from haroon_dev into master 11 months ago

12 Commits (main)

Author SHA1 Message Date
Haroon Amjad 5620cc4442 medical file implementation contd. 11 months ago
haroon amjad d87562caf5 updates 11 months ago
haroon amjad 3a649bca35 Merge branch 'master' into haroon_dev 11 months ago
haroon amjad 9fbb8c3418 updates 11 months ago
haroon amjad 41ca0e27d9 updates 11 months ago
haroon amjad 1de551e799 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/features/authentication/authentication_view_model.dart
11 months ago
haroon amjad 28da6e0a2c updates 11 months ago
haroon amjad f812dac059 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/lab/lab_orders_page.dart
11 months ago
haroon amjad 4269e99be9 updates 11 months ago
haroon amjad 8df38ea6d1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/extensions/widget_extensions.dart
11 months ago
haroon amjad 01b6ab0e4b habib wallet implementation contd. 11 months ago
haroon amjad ccd29f0cf9 updates 11 months ago