projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc788ab 7be937e)
Merge remote-tracking branch 'refs/remotes/origin/master' into next
authorAlexander Ebert <ebert@woltlab.com>
Sat, 28 Nov 2015 13:54:47 +0000 (14:54 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 28 Nov 2015 13:54:47 +0000 (14:54 +0100)
# Conflicts:
# com.woltlab.wcf/package.xml
# wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
# wcfsetup/install/files/js/3rdParty/redactor/plugins/wcombined.min.js
# wcfsetup/install/files/js/3rdParty/redactor/plugins/wmonkeypatch.js
# wcfsetup/install/files/js/WCF.Combined.min.js
# wcfsetup/install/files/lib/system/WCF.class.php

1  2 
wcfsetup/install/files/js/WCF.User.js patch | diff1 | diff2 | blob | history
wcfsetup/install/files/lib/system/cli/command/WorkerCLICommand.class.php patch | diff1 | diff2 | blob | history
wcfsetup/install/files/lib/util/PasswordUtil.class.php patch | diff1 | diff2 | blob | history
wcfsetup/install/files/style/global.less patch | diff1 | diff2 | blob | history

diff --cc wcfsetup/install/files/js/WCF.User.js
Simple merge
WoltLab Suite Core (previously WoltLab Community Framework)