Commit 91a7ecbb authored by Marius Burkard's avatar Marius Burkard

Merge branch 'develop' into 'develop'

wrong main.cf after install (Fixes #5963)

Closes #5963

See merge request ispconfig/ispconfig3!1352
parents 1adea00f d903931f
Pipeline #6828 passed with stage
in 21 seconds