Merge branch '5.5'

author Tim Düsterhus <duesterhus@woltlab.com>

Mon, 4 Jul 2022 15:06:57 +0000 (17:06 +0200)

committer Tim Düsterhus <duesterhus@woltlab.com>

Mon, 4 Jul 2022 15:06:57 +0000 (17:06 +0200)
author Tim Düsterhus <duesterhus@woltlab.com>
Mon, 4 Jul 2022 15:06:57 +0000 (17:06 +0200)
committer Tim Düsterhus <duesterhus@woltlab.com>
Mon, 4 Jul 2022 15:06:57 +0000 (17:06 +0200)
diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Color/Picker.js
Simple merge
diff --cc wcfsetup/install/files/lib/acp/form/PackageEnableUpgradeOverrideForm.class.php
Simple merge
diff --cc wcfsetup/setup/db/install.sql
Simple merge
author	Tim Düsterhus <duesterhus@woltlab.com>
	Mon, 4 Jul 2022 15:06:57 +0000 (17:06 +0200)
committer	Tim Düsterhus <duesterhus@woltlab.com>
	Mon, 4 Jul 2022 15:06:57 +0000 (17:06 +0200)
		1	2
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Color/Picker.js	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/acp/form/PackageEnableUpgradeOverrideForm.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/setup/db/install.sql	patch \|	diff1 \|	diff2 \|	blob \| history