Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sun, 15 Apr 2018 12:54:39 +0000 (14:54 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 15 Apr 2018 12:54:39 +0000 (14:54 +0200)
commit63591b17e1eda0acdfe491c3e5fe9b52479d5488
tree8590af3a821782764cf5b51f1007666026015e4b
parent0e0fede494e9f7da7147588288318f9d13346227
parenta40fd8038006aabc55adf9eab0b00493e70ee987
Merge branch 'master' into next
14 files changed:
wcfsetup/install/files/lib/action/CoreRewriteTestAction.class.php
wcfsetup/install/files/lib/data/label/group/LabelGroupAction.class.php
wcfsetup/install/files/lib/form/ContactForm.class.php
wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php
wcfsetup/install/files/lib/system/bbcode/HtmlBBCodeParser.class.php
wcfsetup/install/files/lib/system/bbcode/highlighter/Highlighter.class.php
wcfsetup/install/files/lib/system/html/input/HtmlInputProcessor.class.php
wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeImg.class.php
wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php
wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php
wcfsetup/install/files/lib/system/importer/UserImporter.class.php
wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php
wcfsetup/install/files/lib/system/request/route/DynamicRequestRoute.class.php