Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Thu, 24 May 2018 15:57:26 +0000 (17:57 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Thu, 24 May 2018 15:57:26 +0000 (17:57 +0200)
commit9be0f8c1fd5f694404bdd988594fc3725ccc1979
tree4cca274463c5ae41f8b296817d403d1feef168d2
parentd86b84d740f60859532fa587178b8d69923d7cf5
parentc52eca99cffb80d8ed9d61ecfbb85a2da4100ed6
Merge branch 'master' into next
19 files changed:
wcfsetup/install/files/lib/acp/form/ArticleAddForm.class.php
wcfsetup/install/files/lib/acp/form/LoginForm.class.php
wcfsetup/install/files/lib/data/user/UserProfile.class.php
wcfsetup/install/files/lib/data/user/UserProfileAction.class.php
wcfsetup/install/files/lib/data/user/avatar/DefaultAvatar.class.php
wcfsetup/install/files/lib/data/user/ignore/UserIgnoreAction.class.php
wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/install/files/lib/system/ad/AdHandler.class.php
wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php
wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php
wcfsetup/install/files/lib/system/html/input/HtmlInputProcessor.class.php
wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeTextParser.class.php
wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeA.class.php
wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeImg.class.php
wcfsetup/install/files/lib/system/message/embedded/object/MessageEmbeddedObjectManager.class.php
wcfsetup/install/files/lib/system/session/SessionHandler.class.php
wcfsetup/install/files/lib/system/worker/AbstractRebuildDataWorker.class.php
wcfsetup/install/files/lib/util/HeaderUtil.class.php
wcfsetup/install/files/lib/util/MessageUtil.class.php