projects / GitHub / WoltLab / WCF.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4e34cc2 d20d857)
Merge remote-tracking branch 'refs/remotes/origin/2.1'
authorMarcel Werk <burntime@woltlab.com>
Tue, 27 Dec 2016 16:28:49 +0000 (17:28 +0100)
committerMarcel Werk <burntime@woltlab.com>
Tue, 27 Dec 2016 16:28:49 +0000 (17:28 +0100)
commit1e238e579a5d538062be77283bfc3a956c6a855e
tree60da2dcb929e8f91ded0a903ce7f4dbb31a473bftree | snapshot (tar.gz zip)
parent4e34cc25deea646bd2cacae0e7005b368b1d2afbcommit | diff
parentd20d8573d2baf813837badfe717e7780079a434bcommit | diff
Merge remote-tracking branch 'refs/remotes/origin/2.1'

# Conflicts:

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