projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6032b6a 09bd80f)
Merge branch 'master' into next
authorAlexander Ebert <ebert@woltlab.com>
Tue, 7 Jul 2015 12:09:16 +0000 (14:09 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 7 Jul 2015 12:09:16 +0000 (14:09 +0200)
Conflicts:
wcfsetup/install/files/js/3rdParty/redactor/plugins/wcombined.min.js
wcfsetup/install/files/js/WCF.Combined.min.js


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)