From: Cyperghost <olaf_schmitz_1@t-online.de>
Date: Mon, 24 Jun 2024 08:25:10 +0000 (+0200)
Subject: Merge branch 'refs/heads/master' into service-worker-notifications
X-Git-Tag: 6.1.0_Alpha_1~47^2~5
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dafe4e4d98ef3d45aa1c838703676812016db738;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'refs/heads/master' into service-worker-notifications

# Conflicts:
#	wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.1.php
---

dafe4e4d98ef3d45aa1c838703676812016db738