Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Sun, 1 Apr 2018 18:32:49 +0000 (20:32 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 1 Apr 2018 18:32:49 +0000 (20:32 +0200)
commitdb03c81ed6e7a922b0ac5929cec89dbb71883c69
treeacdabbdfea54141c4dc3659e49135ca9d627d167
parentc60a874fd7c7a0fa67088cbac2974cfe97301e91
parentafcc15e45d6f0fd765ba9181e8351d27615ec43d
Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:

# wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php
wcfsetup/install/files/lib/system/cronjob/GetUpdateInfoCronjob.class.php
wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php