Merge branch 'master' into next
authorAlexander Ebert <ebert@woltlab.com>
Wed, 26 Jun 2019 10:40:32 +0000 (12:40 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 26 Jun 2019 10:40:32 +0000 (12:40 +0200)
commit056a6ddf7866a0c4e5d3e15facde9f52a147bb16
treea5a58572b2bfe05cf63d63ac5d66fbd2a058865e
parent74ee82c67ef8f3ae1f2adcc63e7c76cc26b60f19
parentd250894d4adfba57bd17fd7f7675770cd7c7df0b
Merge branch 'master' into next
com.woltlab.wcf/templates/quoteMetaCode.tpl
com.woltlab.wcf/templates/register.tpl
wcfsetup/install/files/js/3rdParty/redactor2/redactor.js
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Format.js
wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeProcessor.class.php