Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Mon, 7 May 2018 17:20:31 +0000 (19:20 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 7 May 2018 17:20:31 +0000 (19:20 +0200)
commit6892ce434964fea41a03306385de483be39f111e
treea13381219a2266219731ceba7ee41f6bac36032a
parent9b9c8c2870ee2255220a808e322e4466a87507d7
parent31ce467b21d0053b1f7a944a0caf4d4fd5389310
Merge branch 'master' into next
CodeSniff/WCF/ruleset.xml
wcfsetup/install/files/lib/action/PaypalCallbackAction.class.php
wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php
wcfsetup/install/files/lib/page/AbstractArticlePage.class.php
wcfsetup/install/files/lib/page/CmsPage.class.php
wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/install/files/lib/system/style/StyleCompiler.class.php
wcfsetup/install/files/lib/util/HeaderUtil.class.php
wcfsetup/install/files/lib/util/ImageUtil.class.php
wcfsetup/install/files/lib/util/StringUtil.class.php