projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5100c7 7ed0a58)
Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Tue, 31 Mar 2015 23:54:56 +0000 (01:54 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 31 Mar 2015 23:54:56 +0000 (01:54 +0200)
Conflicts:
com.woltlab.wcf/package.xml
wcfsetup/install/files/lib/system/WCF.class.php


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)