projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 656e19d ea15590)
Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Wed, 18 Oct 2017 09:29:19 +0000 (11:29 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 18 Oct 2017 09:29:19 +0000 (11:29 +0200)
# Conflicts:
# com.woltlab.wcf/package.xml
# wcfsetup/install/files/js/3rdParty/redactor2/plugins/combined.min.js
# wcfsetup/install/files/js/WCF.Combined.min.js
# wcfsetup/install/files/lib/system/WCF.class.php


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)