Merge branch 'refs/heads/6.2' into fancybox
authorCyperghost <olaf_schmitz_1@t-online.de>
Wed, 23 Oct 2024 06:38:37 +0000 (08:38 +0200)
committerCyperghost <olaf_schmitz_1@t-online.de>
Wed, 23 Oct 2024 06:38:37 +0000 (08:38 +0200)
commit0815a998e2f935840dea4bced85f04a4a26b1b2b
tree6bfbb6e5e5eee90580c5137854b099080f0dab95
parentfd7271e10c1316f09d559b60ffc41255c71fcdc0
parent8eea0bbfaa15957e3604bfe76f73c5f0be8daa5a
Merge branch 'refs/heads/6.2' into fancybox

# Conflicts:
# package-lock.json
# package.json
package-lock.json
package.json
wcfsetup/install/files/js/WoltLabSuite/Core/BootstrapFrontend.js