dev_sultan #41

Merged
Haroon6138 merged 6 commits from dev_sultan into master 1 month ago

6 Commits (main)

Author SHA1 Message Date
Sultan khan cd5da116f9 Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
#	lib/features/authentication/widgets/otp_verification_screen.dart
1 month ago
Sultan khan fe36c2a1c1 auto sms 1 month ago
aamir-csol 28a95959e0 Merge branch 'master' into dev_aamir 1 month ago
aamir-csol 5de8314f3f otp screen & register Uae & resend Activation Code. 1 month ago
aamir-csol b9b0dfd1fa Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
1 month ago
aamir-csol 15c07cb4e2 otp screen & register Uae & resend Activation Code. 1 month ago