projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 430772d e311606)
Merge branch 'master' into next
authorAlexander Ebert <ebert@woltlab.com>
Tue, 19 May 2015 20:42:48 +0000 (22:42 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 19 May 2015 20:42:48 +0000 (22:42 +0200)
Conflicts:
com.woltlab.wcf/package.xml


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)