From: Alexander Ebert Date: Sat, 28 Nov 2015 13:54:47 +0000 (+0100) Subject: Merge remote-tracking branch 'refs/remotes/origin/master' into next X-Git-Tag: 3.0.0_Beta_1~2097 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8b17bee85b4744eb14632e21a9802b686cddfe6c;p=GitHub%2FWoltLab%2FWCF.git 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 --- 8b17bee85b4744eb14632e21a9802b686cddfe6c