projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46dbe68 e5f817d)
Merge branch '2.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 2 Sep 2014 18:46:16 +0000 (20:46 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 2 Sep 2014 18:46:16 +0000 (20:46 +0200)
Conflicts:
com.woltlab.wcf/package.xml
wcfsetup/install/files/lib/system/WCF.class.php


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)