projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48f3992 d180e07)
Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Tue, 3 Jun 2014 18:55:01 +0000 (20:55 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 3 Jun 2014 18:55:01 +0000 (20:55 +0200)
Conflicts:
wcfsetup/install/files/js/3rdParty/ckeditor/plugins/wbbcode/plugin.js
wcfsetup/install/files/lib/system/WCF.class.php


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)