projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d9f605 9135744)
Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 24 Sep 2012 17:33:30 +0000 (19:33 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 24 Sep 2012 17:33:30 +0000 (19:33 +0200)
Conflicts:
wcfsetup/install/files/lib/system/style/StyleCompiler.class.php


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)