Merge branch '5.5'

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

Wed, 20 Jul 2022 13:06:14 +0000 (15:06 +0200)

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

Wed, 20 Jul 2022 13:06:14 +0000 (15:06 +0200)
author Tim Düsterhus <duesterhus@woltlab.com>
Wed, 20 Jul 2022 13:06:14 +0000 (15:06 +0200)
committer Tim Düsterhus <duesterhus@woltlab.com>
Wed, 20 Jul 2022 13:06:14 +0000 (15:06 +0200)
diff --cc wcfsetup/install/files/lib/acp/form/PackageEnableUpgradeOverrideForm.class.php
Simple merge
diff --cc wcfsetup/install/files/lib/system/WCF.class.php
Simple merge
diff --cc wcfsetup/install/lang/de.xml
Simple merge
diff --cc wcfsetup/install/lang/en.xml
Simple merge
author	Tim Düsterhus <duesterhus@woltlab.com>
	Wed, 20 Jul 2022 13:06:14 +0000 (15:06 +0200)
committer	Tim Düsterhus <duesterhus@woltlab.com>
	Wed, 20 Jul 2022 13:06:14 +0000 (15:06 +0200)
		1	2
wcfsetup/install/files/lib/acp/form/PackageEnableUpgradeOverrideForm.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/WCF.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