Merge branch '3.0'

author Alexander Ebert <ebert@woltlab.com>

Sat, 21 Apr 2018 11:54:43 +0000 (13:54 +0200)

committer Alexander Ebert <ebert@woltlab.com>

Sat, 21 Apr 2018 11:54:43 +0000 (13:54 +0200)
author Alexander Ebert <ebert@woltlab.com>
Sat, 21 Apr 2018 11:54:43 +0000 (13:54 +0200)
committer Alexander Ebert <ebert@woltlab.com>
Sat, 21 Apr 2018 11:54:43 +0000 (13:54 +0200)
diff --cc wcfsetup/install/files/lib/system/captcha/RecaptchaHandler.class.php
Simple merge
diff --cc wcfsetup/install/files/lib/system/option/CaptchaSelectOptionType.class.php
Simple merge
author	Alexander Ebert <ebert@woltlab.com>
	Sat, 21 Apr 2018 11:54:43 +0000 (13:54 +0200)
committer	Alexander Ebert <ebert@woltlab.com>
	Sat, 21 Apr 2018 11:54:43 +0000 (13:54 +0200)
		1	2
wcfsetup/install/files/lib/system/captcha/RecaptchaHandler.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/option/CaptchaSelectOptionType.class.php	patch \|	diff1 \|	diff2 \|	blob \| history