Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Wed, 11 Oct 2017 09:28:54 +0000 (11:28 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 11 Oct 2017 09:28:54 +0000 (11:28 +0200)
commit12621eaf7cf24be4ee3e8ba8f10f38df5b8fb0e7
tree9de21dccb3ef7f3dcabcac91a424c71f64aa3565
parenta1a820646d783a928749195d5356df9a61807ea2
parent163ead009c7eb8beb9a6912979fc837d8b7b6aa9
Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:

# wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeProcessor.class.php
wcfsetup/install/files/style/bbcode/code.scss
wcfsetup/install/lang/en.xml