projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44de21b 578ad8d)
Merge branch 'master' into next
authorAlexander Ebert <ebert@woltlab.com>
Thu, 2 Jul 2015 13:52:26 +0000 (15:52 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 2 Jul 2015 13:52:26 +0000 (15:52 +0200)
Conflicts:
wcfsetup/install/files/js/3rdParty/redactor/plugins/wcombined.min.js


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)