Merge branch '5.2' into 5.3

author Matthias Schmidt <gravatronics@live.com>

Wed, 28 Oct 2020 13:02:05 +0000 (14:02 +0100)

committer Matthias Schmidt <gravatronics@live.com>

Wed, 28 Oct 2020 13:02:05 +0000 (14:02 +0100)
author Matthias Schmidt <gravatronics@live.com>
Wed, 28 Oct 2020 13:02:05 +0000 (14:02 +0100)
committer Matthias Schmidt <gravatronics@live.com>
Wed, 28 Oct 2020 13:02:05 +0000 (14:02 +0100)
diff --cc wcfsetup/install/files/lib/data/media/MediaAction.class.php
Simple merge
diff --cc wcfsetup/install/files/lib/util/UserRegistrationUtil.class.php
Simple merge
author	Matthias Schmidt <gravatronics@live.com>
	Wed, 28 Oct 2020 13:02:05 +0000 (14:02 +0100)
committer	Matthias Schmidt <gravatronics@live.com>
	Wed, 28 Oct 2020 13:02:05 +0000 (14:02 +0100)
		1	2
wcfsetup/install/files/lib/data/media/MediaAction.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/util/UserRegistrationUtil.class.php	patch \|	diff1 \|	diff2 \|	blob \| history