projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ccea23b ab273cd)
Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Sun, 1 Jun 2014 19:58:27 +0000 (21:58 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 1 Jun 2014 19:58:27 +0000 (21:58 +0200)
Conflicts:
com.woltlab.wcf/package.xml


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)