projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 234f0a1 e22e99b)
Merge remote-tracking branch 'origin/next' into next
authorAlexander Ebert <ebert@woltlab.com>
Wed, 28 Sep 2016 20:38:33 +0000 (22:38 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 28 Sep 2016 20:38:33 +0000 (22:38 +0200)
# Conflicts:
# wcfsetup/install/files/lib/util/HeaderUtil.class.php


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)