projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb1c4b7 e7c727a)
Merge branch 'master' of github.com:WoltLab/WCF
authorTim Düsterhus <duesterhus@woltlab.com>
Sat, 26 Jan 2013 13:42:06 +0000 (14:42 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Sat, 26 Jan 2013 13:42:06 +0000 (14:42 +0100)
Conflicts:
wcfsetup/install/files/acp/templates/package.tpl


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)