Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
No related merge requests found
Showing
with 99 additions and 288 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment