Skip to content
Snippets Groups Projects
Commit 64f3c770 authored by Carlo Navarra's avatar Carlo Navarra
Browse files

Merge branch 'production' into 'carna56-production-patch-47398' 

# Conflicts:
#   manifests/init.pp
parents b790b97a 7a094cc9
Branches
Tags
Checking pipeline status
Hide whitespace changes
Inline Side-by-side
Showing
with 34 additions and 19 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment