projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1d83d3 e95e11e)
Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 9 Aug 2014 09:40:29 +0000 (11:40 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 9 Aug 2014 09:40:29 +0000 (11:40 +0200)
Conflicts:
wcfsetup/install/files/lib/system/WCFACP.class.php


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)