Merge branch '5.4'

author Alexander Ebert <ebert@woltlab.com>

Thu, 21 Apr 2022 13:14:06 +0000 (15:14 +0200)

committer Alexander Ebert <ebert@woltlab.com>

Thu, 21 Apr 2022 13:14:06 +0000 (15:14 +0200)
author Alexander Ebert <ebert@woltlab.com>
Thu, 21 Apr 2022 13:14:06 +0000 (15:14 +0200)
committer Alexander Ebert <ebert@woltlab.com>
Thu, 21 Apr 2022 13:14:06 +0000 (15:14 +0200)
diff --cc wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabClean.js
Simple merge
diff --cc wcfsetup/install/files/lib/data/user/avatar/UserAvatarAction.class.php
Simple merge
author	Alexander Ebert <ebert@woltlab.com>
	Thu, 21 Apr 2022 13:14:06 +0000 (15:14 +0200)
committer	Alexander Ebert <ebert@woltlab.com>
	Thu, 21 Apr 2022 13:14:06 +0000 (15:14 +0200)
		1	2
wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabClean.js	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/data/user/avatar/UserAvatarAction.class.php	patch \|	diff1 \|	diff2 \|	blob \| history