Merge remote-tracking branch 'refs/remotes/origin/3.0'

author Alexander Ebert <ebert@woltlab.com>

Thu, 13 Jul 2017 23:32:16 +0000 (01:32 +0200)

committer Alexander Ebert <ebert@woltlab.com>

Thu, 13 Jul 2017 23:32:16 +0000 (01:32 +0200)
author Alexander Ebert <ebert@woltlab.com>
Thu, 13 Jul 2017 23:32:16 +0000 (01:32 +0200)
committer Alexander Ebert <ebert@woltlab.com>
Thu, 13 Jul 2017 23:32:16 +0000 (01:32 +0200)
diff --cc wcfsetup/install/files/lib/data/user/UserProfileAction.class.php
Simple merge
diff --cc wcfsetup/install/files/lib/util/StringUtil.class.php
Simple merge
author	Alexander Ebert <ebert@woltlab.com>
	Thu, 13 Jul 2017 23:32:16 +0000 (01:32 +0200)
committer	Alexander Ebert <ebert@woltlab.com>
	Thu, 13 Jul 2017 23:32:16 +0000 (01:32 +0200)
		1	2
wcfsetup/install/files/lib/data/user/UserProfileAction.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/util/StringUtil.class.php	patch \|	diff1 \|	diff2 \|	blob \| history