Merge branch '3.0'

author Alexander Ebert <ebert@woltlab.com>

Wed, 25 Sep 2019 09:16:32 +0000 (11:16 +0200)

committer Alexander Ebert <ebert@woltlab.com>

Wed, 25 Sep 2019 09:16:32 +0000 (11:16 +0200)
author Alexander Ebert <ebert@woltlab.com>
Wed, 25 Sep 2019 09:16:32 +0000 (11:16 +0200)
committer Alexander Ebert <ebert@woltlab.com>
Wed, 25 Sep 2019 09:16:32 +0000 (11:16 +0200)
diff --cc wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php
Simple merge
diff --cc wcfsetup/install/files/lib/acp/form/UserAddForm.class.php
Simple merge
diff --cc wcfsetup/install/files/lib/form/RegisterForm.class.php
Simple merge
author	Alexander Ebert <ebert@woltlab.com>
	Wed, 25 Sep 2019 09:16:32 +0000 (11:16 +0200)
committer	Alexander Ebert <ebert@woltlab.com>
	Wed, 25 Sep 2019 09:16:32 +0000 (11:16 +0200)
		1	2
wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/acp/form/UserAddForm.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/form/RegisterForm.class.php	patch \|	diff1 \|	diff2 \|	blob \| history