Merge branch 'master' into next

author Tim Düsterhus <duesterhus@woltlab.com>

Sun, 24 Mar 2019 17:16:34 +0000 (18:16 +0100)

committer Tim Düsterhus <duesterhus@woltlab.com>

Sun, 24 Mar 2019 17:16:34 +0000 (18:16 +0100)
author Tim Düsterhus <duesterhus@woltlab.com>
Sun, 24 Mar 2019 17:16:34 +0000 (18:16 +0100)
committer Tim Düsterhus <duesterhus@woltlab.com>
Sun, 24 Mar 2019 17:16:34 +0000 (18:16 +0100)
diff --cc com.woltlab.wcf/page.xml
Simple merge
diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/ColorUtil.js
Simple merge
diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js
Simple merge
diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Format.js
Simple merge
diff --cc wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php
Simple merge
author	Tim Düsterhus <duesterhus@woltlab.com>
	Sun, 24 Mar 2019 17:16:34 +0000 (18:16 +0100)
committer	Tim Düsterhus <duesterhus@woltlab.com>
	Sun, 24 Mar 2019 17:16:34 +0000 (18:16 +0100)
		1	2
com.woltlab.wcf/page.xml	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/js/WoltLabSuite/Core/ColorUtil.js	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Format.js	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php	patch \|	diff1 \|	diff2 \|	blob \| history