Skip to content
Snippets Groups Projects
Commit d5839e2e authored by samba's avatar samba
Browse files

Merge branch 'master' into 'samba-master-patch-38223' 

# Conflicts:
#   roles/rt4/templates/rt4.pm.j2
parents 1f3d06d9 ae1a4ce9
No related branches found
No related tags found
Checking pipeline status
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment