Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Thu, 5 Apr 2018 15:29:04 +0000 (17:29 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Thu, 5 Apr 2018 15:29:04 +0000 (17:29 +0200)
commit0e0fede494e9f7da7147588288318f9d13346227
tree9321a869a000ff5a5b9d4e807127fdb7b7fd9ab5
parent557cd1535d34c5abb23373b534892e805a0c2e9d
parenta5b3d3dd6f620eca8cd8e921940c72583e061b19
Merge branch 'master' into next
16 files changed:
wcfsetup/install/files/lib/acp/form/UserTrophyAddForm.class.php
wcfsetup/install/files/lib/acp/page/PluginStorePurchasedItemsPage.class.php
wcfsetup/install/files/lib/data/article/ArticleAction.class.php
wcfsetup/install/files/lib/data/box/BoxAction.class.php
wcfsetup/install/files/lib/data/user/UserProfileAction.class.php
wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/install/files/lib/system/WCFSetup.class.php
wcfsetup/install/files/lib/system/bbcode/HtmlBBCodeParser.class.php
wcfsetup/install/files/lib/system/bulk/processing/user/SendMailUserBulkProcessingAction.class.php
wcfsetup/install/files/lib/system/cronjob/GetUpdateInfoCronjob.class.php
wcfsetup/install/files/lib/system/html/output/AmpHtmlOutputProcessor.class.php
wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeProcessor.class.php
wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeWoltlabSpoiler.class.php
wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php
wcfsetup/install/files/lib/system/package/validation/PackageValidationArchive.class.php
wcfsetup/install/files/lib/system/upload/UserCoverPhotoUploadFileValidationStrategy.class.php