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)
commit8b17bee85b4744eb14632e21a9802b686cddfe6c
tree1df4cc85638cfd82f7534fb125b25cbc8351f535
parentbc788ab94d0e976f5772ba72cf3eca82c4eb3f4e
parent7be937e65ae05d3e5ecdcf4889f441baec022a00
Merge remote-tracking branch 'refs/remotes/origin/master' into next

# 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
wcfsetup/install/files/js/WCF.User.js
wcfsetup/install/files/lib/system/cli/command/WorkerCLICommand.class.php
wcfsetup/install/files/lib/util/PasswordUtil.class.php
wcfsetup/install/files/style/global.less