Skip to content
Commit 7b5d0928 authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'develop' into '6328-support-php-8-x'

# Conflicts:
#   server/lib/classes/letsencrypt.inc.php
parents 351c2b6d 4e36ffb3
Pipeline #12382 passed with stage
in 8 minutes and 21 seconds