Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sat, 9 Jun 2018 10:33:36 +0000 (12:33 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 9 Jun 2018 10:33:36 +0000 (12:33 +0200)
commit5d78dfe8f9af68fc113c0b946e9e37ec144748bb
treeec5709bffeba43e02c4c25f04ff215f6c9cdb7ca
parent9be0f8c1fd5f694404bdd988594fc3725ccc1979
parentafbd3fb6c2fbf68b63627c3b3d5b2afdfdfc2387
Merge branch 'master' into next
wcfsetup/install/files/lib/acp/page/VersionTrackerListPage.class.php
wcfsetup/install/files/lib/action/ImageProxyAction.class.php
wcfsetup/install/files/lib/data/language/LanguageEditor.class.php
wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeProcessor.class.php
wcfsetup/install/files/lib/system/option/user/group/BBCodeSelectUserGroupOptionType.class.php
wcfsetup/install/files/lib/system/option/user/group/BooleanUserGroupOptionType.class.php