Merge branch 'refs/heads/master' into service-worker-notifications
authorOlaf Braun <info@braun-development.de>
Mon, 24 Jun 2024 12:57:36 +0000 (14:57 +0200)
committerOlaf Braun <info@braun-development.de>
Mon, 24 Jun 2024 12:57:36 +0000 (14:57 +0200)
commitb923428406fbdcbc21a406dd288be75928616178
tree026e424deb28c7ca788bc7a7fab849a21e841778
parent313072db071682a87242c88a497609439de2d91c
parentea13abe42a2be50eb72009cae4232bcc7a12db50
Merge branch 'refs/heads/master' into service-worker-notifications

# Conflicts:
# wcfsetup/install/files/lib/system/api/composer.json
# wcfsetup/install/files/lib/system/api/composer.lock
# wcfsetup/install/files/lib/system/api/composer/installed.php
wcfsetup/install/files/lib/system/api/composer.json
wcfsetup/install/files/lib/system/api/composer.lock
wcfsetup/install/files/lib/system/api/composer/autoload_classmap.php
wcfsetup/install/files/lib/system/api/composer/autoload_static.php
wcfsetup/install/files/lib/system/api/composer/installed.json
wcfsetup/install/files/lib/system/api/composer/installed.php
wcfsetup/test.php