From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 11 Oct 2017 09:28:54 +0000 (+0200)
Subject: Merge remote-tracking branch 'refs/remotes/origin/3.0'
X-Git-Tag: 3.1.0_Beta_2~45
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=12621eaf7cf24be4ee3e8ba8f10f38df5b8fb0e7;p=GitHub%2FWoltLab%2FWCF.git

Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:

#	wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php
---

12621eaf7cf24be4ee3e8ba8f10f38df5b8fb0e7