projects / GitHub / WoltLab / WCF.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c26f54c 766283e)
Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0
authorAlexander Ebert <ebert@woltlab.com>
Wed, 7 Mar 2018 12:48:30 +0000 (13:48 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 7 Mar 2018 12:48:30 +0000 (13:48 +0100)
commit4d692ffaa3ed91f751a1de7259d332e955ce624a
tree5ad2027a005f4be1ca3a8afd5091102f28450b75tree | snapshot (tar.gz zip)
parentc26f54c7268d7f2f061a5673822693e748a3dff9commit | diff
parent766283e79798d15d3b8a96de0dc73adb10d79ff3commit | diff
Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0

# Conflicts:

# wcfsetup/install/files/lib/system/package/validation/PackageValidationArchive.class.php
wcfsetup/install/files/lib/system/package/validation/PackageValidationArchive.class.php diff1 | diff2 | blob | history
WoltLab Suite Core (previously WoltLab Community Framework)