Merge branch '3.1' into 5.2

author Marcel Werk <burntime@woltlab.com>

Thu, 1 Oct 2020 14:52:57 +0000 (16:52 +0200)

committer Marcel Werk <burntime@woltlab.com>

Thu, 1 Oct 2020 14:52:57 +0000 (16:52 +0200)
author Marcel Werk <burntime@woltlab.com>
Thu, 1 Oct 2020 14:52:57 +0000 (16:52 +0200)
committer Marcel Werk <burntime@woltlab.com>
Thu, 1 Oct 2020 14:52:57 +0000 (16:52 +0200)
diff --cc wcfsetup/install/files/lib/system/option/BirthdayOptionType.class.php
Simple merge
diff --cc wcfsetup/install/files/lib/system/option/DateOptionType.class.php
Simple merge
author	Marcel Werk <burntime@woltlab.com>
	Thu, 1 Oct 2020 14:52:57 +0000 (16:52 +0200)
committer	Marcel Werk <burntime@woltlab.com>
	Thu, 1 Oct 2020 14:52:57 +0000 (16:52 +0200)
		1	2
wcfsetup/install/files/lib/system/option/BirthdayOptionType.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/option/DateOptionType.class.php	patch \|	diff1 \|	diff2 \|	blob \| history