Merge branch 'refs/heads/master' into service-worker-notifications
authorCyperghost <olaf_schmitz_1@t-online.de>
Mon, 24 Jun 2024 08:25:10 +0000 (10:25 +0200)
committerCyperghost <olaf_schmitz_1@t-online.de>
Mon, 24 Jun 2024 08:25:10 +0000 (10:25 +0200)
commitdafe4e4d98ef3d45aa1c838703676812016db738
tree819cf0a0009a997db0b4c00442d3601c758e4a51
parent45f8ea4b5f04c397deea9c0559416bfba8462629
parent1eba6a44e6a6a6d9c51f893b6a63d0a2c159e78c
Merge branch 'refs/heads/master' into service-worker-notifications

# Conflicts:
# wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.1.php
com.woltlab.wcf/option.xml
com.woltlab.wcf/templates/headIncludeJavaScript.tpl
wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.1.php
wcfsetup/install/files/lib/event/acp/dashboard/box/PHPExtensionCollecting.class.php
wcfsetup/setup/db/install.sql