Commit Graph

8 Commits (773cc9229b05ece5ca12ea46a6d03f5c3e3ddf76)

Author SHA1 Message Date
haroon amjad b27e3268b1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
5 months ago
aamir-csol 24362f67cb family screen & widgets 5 months ago
aamir-csol d918b6e464 family screen & widgets 5 months ago
aamir-csol e5488299b8 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/presentation/my_family/widget/family_cards.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
#	lib/widgets/common_bottom_sheet.dart
5 months ago
aamir-csol 1335d3a7c8 family screen & widgets 5 months ago
aamir-csol 288a0018ce family screen & widgets 5 months ago
faizatflutter 94313b8870 Improved Error Handling 5 months ago
aamir-csol a79dcad221 family screen & widgets 5 months ago