Skip to content
Commit f3546271 authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch 'develop' into '5767-installer-does-not-issue-le-certificate' 

# Conflicts:
#   install/install.php
#   install/lib/installer_base.lib.php
#   install/update.php
parents ebcab357 671b5de8
Pipeline #5413 passed with stage
in 7 minutes and 28 seconds
Hide whitespace changes
Inline Side-by-side
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