projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e440c14 a1e44ed)
Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 2 Nov 2011 14:12:45 +0000 (15:12 +0100)
committerMarcel Werk <burntime@woltlab.com>
Wed, 2 Nov 2011 14:12:45 +0000 (15:12 +0100)
Conflicts:
wcfsetup/install/files/js/WCF.js


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)