Commit 099079f8 authored by Cool Fire's avatar Cool Fire

Merge branch 'master' into 'mailto_fixup'

# Conflicts:
#   profile/manifests/base/securityupdates.pp
parents 921ab9ab 6367e803
Pipeline #597 passed with stage
in 5 minutes and 30 seconds
Markdown is supported
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