projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8650060 87b376f)
Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 30 Apr 2014 09:56:18 +0000 (11:56 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 30 Apr 2014 09:56:18 +0000 (11:56 +0200)
Conflicts:
wcfsetup/install/files/js/WCF.Combined.js


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)