Merge remote-tracking branch 'origin/6.0'
authorOlaf Braun <info@braun-development.de>
Thu, 25 Apr 2024 14:43:17 +0000 (16:43 +0200)
committerOlaf Braun <info@braun-development.de>
Thu, 25 Apr 2024 14:43:17 +0000 (16:43 +0200)
commit7966721e4709d792180fb05a693cafd8db0e2793
tree2e74fa6779094288f44cf8fec37563c751cd1dec
parent1faf09719003dfa9c613073df02cd375d01391a6
parent617fd39c72830e03132f2eb0e95aeb96fba3c3ea
Merge remote-tracking branch 'origin/6.0'

# Conflicts:
# com.woltlab.wcf/package.xml
# syncTemplates.json
# wcfsetup/install/files/js/WoltLabSuite.Core.min.js
# wcfsetup/install/files/lib/action/FacebookAuthAction.class.php
# wcfsetup/install/files/lib/action/GithubAuthAction.class.php
# wcfsetup/install/files/lib/action/GoogleAuthAction.class.php
# wcfsetup/install/files/lib/action/TwitterAuthAction.class.php
# wcfsetup/install/files/lib/system/WCF.class.php
# wcfsetup/install/files/lib/system/html/node/HtmlNodeUnfurlLink.class.php
# wcfsetup/install/lang/de.xml
# wcfsetup/install/lang/en.xml
spiderList/spiderList.xml
wcfsetup/install/files/acp/templates/styleAdd.tpl
wcfsetup/install/files/lib/action/FacebookAuthAction.class.php
wcfsetup/install/files/lib/action/GithubAuthAction.class.php
wcfsetup/install/files/lib/action/GoogleAuthAction.class.php
wcfsetup/install/files/lib/action/TwitterAuthAction.class.php
wcfsetup/install/files/lib/system/bbcode/WoltLabSuiteMediaBBCode.class.php
wcfsetup/install/files/lib/system/html/node/HtmlNodeUnfurlLink.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml