projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 54e8ab7 a61d909)
Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Thu, 7 Sep 2017 12:01:55 +0000 (14:01 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 7 Sep 2017 12:01:55 +0000 (14:01 +0200)
# Conflicts:
# wcfsetup/install/files/js/3rdParty/redactor2/redactor.min.js


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)