projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2768df4 2c77873)
Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Fri, 27 Jun 2014 19:39:31 +0000 (21:39 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 27 Jun 2014 19:39:31 +0000 (21:39 +0200)
Conflicts:
wcfsetup/install/files/js/3rdParty/ckeditor/plugins/wbbcode/plugin.js


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)