projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5905c0 3f48db0)
Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Sun, 1 Mar 2015 17:52:34 +0000 (18:52 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 1 Mar 2015 17:52:34 +0000 (18:52 +0100)
Conflicts:
README.md


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)