Merge branch '3.0'

author Marcel Werk <burntime@woltlab.com>

Mon, 18 Mar 2019 15:02:22 +0000 (16:02 +0100)

committer Marcel Werk <burntime@woltlab.com>

Mon, 18 Mar 2019 15:02:22 +0000 (16:02 +0100)
author Marcel Werk <burntime@woltlab.com>
Mon, 18 Mar 2019 15:02:22 +0000 (16:02 +0100)
committer Marcel Werk <burntime@woltlab.com>
Mon, 18 Mar 2019 15:02:22 +0000 (16:02 +0100)
diff --cc wcfsetup/install/files/lib/acp/form/BBCodeAddForm.class.php
Simple merge
diff --cc wcfsetup/install/files/lib/acp/form/BBCodeEditForm.class.php
Simple merge
author	Marcel Werk <burntime@woltlab.com>
	Mon, 18 Mar 2019 15:02:22 +0000 (16:02 +0100)
committer	Marcel Werk <burntime@woltlab.com>
	Mon, 18 Mar 2019 15:02:22 +0000 (16:02 +0100)
		1	2
wcfsetup/install/files/lib/acp/form/BBCodeAddForm.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/acp/form/BBCodeEditForm.class.php	patch \|	diff1 \|	diff2 \|	blob \| history