Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Sun, 24 Mar 2019 17:16:34 +0000 (18:16 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Sun, 24 Mar 2019 17:16:34 +0000 (18:16 +0100)
commit0cb2258ac14a79049e1e62b3c0f5fd9da8d3b735
tree8737182b9cd2bc83d85dc4d87c0048da8d444420
parent46be73d0a1ee475ce678d3962c15305af7d9dfa2
parentfc281a4ebac779c3d422626c8b653b33537355c0
Merge branch 'master' into next
com.woltlab.wcf/page.xml
wcfsetup/install/files/js/WoltLabSuite/Core/ColorUtil.js
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Format.js
wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php