Merge pull request #4489 from WoltLab/5.5-boxen-condition-system

author Alexander Ebert <ebert@woltlab.com>

Thu, 2 Sep 2021 13:30:30 +0000 (15:30 +0200)

committer GitHub <noreply@github.com>

Thu, 2 Sep 2021 13:30:30 +0000 (15:30 +0200)
author Alexander Ebert <ebert@woltlab.com>
Thu, 2 Sep 2021 13:30:30 +0000 (15:30 +0200)
committer GitHub <noreply@github.com>
Thu, 2 Sep 2021 13:30:30 +0000 (15:30 +0200)
diff --cc com.woltlab.wcf/objectType.xml
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>
	Thu, 2 Sep 2021 13:30:30 +0000 (15:30 +0200)
committer	GitHub <noreply@github.com>
	Thu, 2 Sep 2021 13:30:30 +0000 (15:30 +0200)
		1	2
com.woltlab.wcf/objectType.xml	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