projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 025df23 526e433)
Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 21 May 2013 13:30:30 +0000 (15:30 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 21 May 2013 13:30:30 +0000 (15:30 +0200)
Conflicts:
com.woltlab.wcf/template/userPanel.tpl


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)