Merge remote-tracking branch 'origin/6.0' into image-center
authorCyperghost <olaf_schmitz_1@t-online.de>
Wed, 13 Dec 2023 12:16:07 +0000 (13:16 +0100)
committerCyperghost <olaf_schmitz_1@t-online.de>
Wed, 13 Dec 2023 12:16:07 +0000 (13:16 +0100)
commit9ef0c2aeacb61f755ab07f38d053aca2c3dfdfb3
tree6cdeca501d25b23740a64752514de559c66bd73d
parent818bec760edfa8b172b9ac053bb739d591d33e42
parent09400e13864cb1f4e247b2393b0ba746871e4a3f
Merge remote-tracking branch 'origin/6.0' into image-center

# Conflicts:
# com.woltlab.wcf/templates/mediaBBCodeTag.tpl
# wcfsetup/install/files/acp/templates/mediaBBCodeTag.tpl
# wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php
com.woltlab.wcf/bbcode.xml
com.woltlab.wcf/templates/mediaBBCodeTag.tpl
wcfsetup/install/files/acp/templates/mediaBBCodeTag.tpl
wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php
wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeImg.class.php