Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Thu, 12 Jul 2018 17:33:27 +0000 (19:33 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Thu, 12 Jul 2018 17:33:27 +0000 (19:33 +0200)
commit012920ceaad0f6d3fa9c20c7c38e13491721fb23
tree3fc0710f8d26a17481c22417cfe3085c3b90e0b0
parentf4fab54f568efcce9bae0a5948ea1b44622b66de
parent80f796a73aacc80af2420329849383ac65214e1e
Merge branch 'master' into next
wcfsetup/install/files/lib/data/user/UserProfile.class.php
wcfsetup/install/files/lib/system/html/input/filter/MessageHtmlInputFilter.class.php
wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeTextParser.class.php
wcfsetup/install/files/lib/system/html/metacode/converter/UrlMetacodeConverter.class.php
wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeImg.class.php
wcfsetup/install/files/lib/system/package/plugin/BoxPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/trophy/condition/TrophyConditionHandler.class.php