You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

aamir-csol aaa8222b1a Merge branch 'master' into dev_aamir ... # Conflicts: # lib/core/api/api_client.dart # lib/core/app_assets.dart # lib/features/medical_file/medical_file_repo.dart # lib/features/medical_file/medical_file_view_model.dart # lib/presentation/home/landing_page.dart # lib/presentation/medical_file/medical_file_page.dart # lib/presentation/profile_settings/profile_settings.dart # lib/widgets/chip/app_custom_chip_widget.dart		4 weeks ago
..
core	Merge branch 'master' into dev_aamir	4 weeks ago
extensions	family screen & widgets	1 month ago
features	Merge branch 'master' into dev_aamir	4 weeks ago
generated	Merge remote-tracking branch 'origin/master' into appointment_filter	4 weeks ago
presentation	Merge branch 'master' into dev_aamir	4 weeks ago
routes	family screen & widgets	1 month ago
services	family screen & widgets	4 weeks ago
theme	appointment filters added.	4 weeks ago
widgets	Merge branch 'master' into dev_aamir	4 weeks ago
firebase_options.dart	initial commit	2 months ago
main.dart	updates	4 weeks ago
splashPage.dart	login bypass removed	4 weeks ago