Commit Graph

9 Commits (3e5c3a3a273d38c869de9acb65d0168ed6e4ac8c)

Author SHA1 Message Date
aamir-csol 02ae79c458 Merge branch 'refs/heads/master' into dev_aamir 2 weeks ago
faizatflutter 72d765e508 Design Updates 3 weeks ago
aamir-csol cd81372fc6 family screen add fixes & remove & switch & widgets 3 weeks ago
aamir-csol bf8f98ffb1 family screen add fixes & remove & switch & widgets 3 weeks ago
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
4 weeks ago
aamir-csol 24362f67cb family screen & widgets 4 weeks ago
aamir-csol d918b6e464 family screen & widgets 4 weeks 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
1 month ago
faizatflutter 94313b8870 Improved Error Handling 1 month ago