Skip to content
Commit 3d9d1736 authored by Rushni  K's avatar Rushni K
Browse files

Merge branch 'prod' into 'develop'

# Conflicts:
#   LoginApi/Src/Presentation/LoginApi.WebApi/EmailTemplates/EmailOtpTemplate.html
#   LoginApi/Src/Presentation/LoginApi.WebApi/EmailTemplates/ResetPasswordTemplate.html
#   LoginApi/Src/Presentation/LoginApi.WebApi/EmailTemplates/WelcomeTemplate.html
#   LoginApi/Src/Presentation/LoginApi.WebApi/Program.cs
#   LoginApi/Src/Presentation/LoginApi.WebApi/appsettings.json
parents 4e27e2a0 67107dd9
Loading
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment