Commit Graph

7 Commits (36193d349cc6cf8a7e0154a73b18d3a8b2ee13d4)

Author SHA1 Message Date
aamir-csol 36193d349c Merge remote-tracking branch 'origin/dev_sultan' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_repo.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/features/medical_file/medical_file_view_model.dart
1 month ago
aamir-csol 02433e1bef family screen & widgets 1 month ago
Sultan khan 3acd549de7 no message 1 month ago
aamir-csol 192d617350 family screen & widgets 1 month ago
aamir-csol 1125437a56 family screen & widgets 1 month ago
aamir-csol f9bfc131a8 family screen & widgets 1 month ago
aamir-csol a79dcad221 family screen & widgets 1 month ago