Skip to content
GitLab
Commit 380b2a8e authored by shishir suman's avatar shishir suman
Browse files

Merge branch 'main' into user_management 

# Conflicts:
#	src/main/resources/application.properties
parents 47e42dc9 f6c0e030
main Escalate_ticket_send_mail_to_raiser UAT UPHRH_7903_mobile_otp UPHRH_quartz_scheduler Velocity_template_changes admin_config_changes bug_fixes_01_11 github/fork/vky25/patch-1 rahu_test shishir_dynamic_schedular shishir_ticket_statistics_by_user user_management
1 merge request!15User management
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 515 additions and 144 deletions
+515 -144
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment