Merge branch '5.2' into 5.3

author Alexander Ebert <ebert@woltlab.com>

Mon, 7 Dec 2020 20:00:31 +0000 (21:00 +0100)

committer Alexander Ebert <ebert@woltlab.com>

Mon, 7 Dec 2020 20:00:31 +0000 (21:00 +0100)
author Alexander Ebert <ebert@woltlab.com>
Mon, 7 Dec 2020 20:00:31 +0000 (21:00 +0100)
committer Alexander Ebert <ebert@woltlab.com>
Mon, 7 Dec 2020 20:00:31 +0000 (21:00 +0100)
diff --cc wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php
Simple merge
diff --cc wcfsetup/install/lang/de.xml
Simple merge
diff --cc wcfsetup/install/lang/en.xml
Simple merge
author	Alexander Ebert <ebert@woltlab.com>
	Mon, 7 Dec 2020 20:00:31 +0000 (21:00 +0100)
committer	Alexander Ebert <ebert@woltlab.com>
	Mon, 7 Dec 2020 20:00:31 +0000 (21:00 +0100)
		1	2
wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/de.xml	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/en.xml	patch \|	diff1 \|	diff2 \|	blob \| history