Merge pull request #3934 from WoltLab/box_pages_restricting_viewing

author Joshua Rüsweg <ruesweg@woltlab.com>

Thu, 4 Feb 2021 15:23:50 +0000 (16:23 +0100)

committer GitHub <noreply@github.com>

Thu, 4 Feb 2021 15:23:50 +0000 (16:23 +0100)
author Joshua Rüsweg <ruesweg@woltlab.com>
Thu, 4 Feb 2021 15:23:50 +0000 (16:23 +0100)
committer GitHub <noreply@github.com>
Thu, 4 Feb 2021 15:23:50 +0000 (16:23 +0100)
diff --cc wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_db.php
Simple merge
diff --cc wcfsetup/install/lang/de.xml
Simple merge
diff --cc wcfsetup/install/lang/en.xml
Simple merge
diff --cc wcfsetup/setup/db/install.sql
Simple merge
author	Joshua Rüsweg <ruesweg@woltlab.com>
	Thu, 4 Feb 2021 15:23:50 +0000 (16:23 +0100)
committer	GitHub <noreply@github.com>
	Thu, 4 Feb 2021 15:23:50 +0000 (16:23 +0100)
		1	2
wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_db.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
wcfsetup/setup/db/install.sql	patch \|	diff1 \|	diff2 \|	blob \| history