Merge branch 'master' into next

author Alexander Ebert <ebert@woltlab.com>

Sun, 3 Nov 2019 15:58:26 +0000 (16:58 +0100)

committer Alexander Ebert <ebert@woltlab.com>

Sun, 3 Nov 2019 15:58:26 +0000 (16:58 +0100)
author Alexander Ebert <ebert@woltlab.com>
Sun, 3 Nov 2019 15:58:26 +0000 (16:58 +0100)
committer Alexander Ebert <ebert@woltlab.com>
Sun, 3 Nov 2019 15:58:26 +0000 (16:58 +0100)
diff --cc wcfsetup/install/files/acp/templates/userAdd.tpl
Simple merge
diff --cc wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabClean.js
Simple merge
diff --cc wcfsetup/install/files/lib/system/menu/user/profile/content/LikesUserProfileMenuContent.class.php
Simple merge
author	Alexander Ebert <ebert@woltlab.com>
	Sun, 3 Nov 2019 15:58:26 +0000 (16:58 +0100)
committer	Alexander Ebert <ebert@woltlab.com>
	Sun, 3 Nov 2019 15:58:26 +0000 (16:58 +0100)
		1	2
wcfsetup/install/files/acp/templates/userAdd.tpl	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabClean.js	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/menu/user/profile/content/LikesUserProfileMenuContent.class.php	patch \|	diff1 \|	diff2 \|	blob \| history