Skip to content
Commit 502a66bb authored by Christian's avatar Christian
Browse files

Merge branch 'develop' into 'develop'

# Conflicts:
#   install/dist/tpl/gentoo/apache_ispconfig.vhost.master
parents 69c4da02 95377233
Pipeline #12742 passed with stage
in 8 minutes and 9 seconds
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