Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Sat, 30 Jun 2018 20:33:24 +0000 (22:33 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Sat, 30 Jun 2018 20:33:24 +0000 (22:33 +0200)
commit28431bdf03503091d1cc5d57cfa819b5eba905f1
tree4d9430319937fe9fa73b56f8c798e16093529e3f
parenta09371dedf0edc8c5e3cd68ceed46ef00b39b3cc
parentcd17f26307b1ae5ceb67bfffdceaf3508fc03c88
Merge branch 'master' into next
wcfsetup/install/files/acp/templates/header.tpl
wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/install/files/lib/system/html/node/AbstractHtmlNodeProcessor.class.php
wcfsetup/install/files/lib/system/package/plugin/AbstractOptionPackageInstallationPlugin.class.php
wcfsetup/install/lang/de.xml