projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9422050 0f81900)
Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Sat, 31 Jan 2015 10:57:18 +0000 (11:57 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 31 Jan 2015 10:57:18 +0000 (11:57 +0100)
Conflicts:
com.woltlab.wcf/package.xml
wcfsetup/install/files/lib/system/WCF.class.php


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)