From: Alexander Ebert Date: Sat, 24 Oct 2015 13:10:03 +0000 (+0200) Subject: Merge remote-tracking branch 'refs/remotes/origin/master' into next X-Git-Tag: 3.0.0_Beta_1~2099 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c2275f5014d928dec2506316decf977e62f196f6;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 --- c2275f5014d928dec2506316decf977e62f196f6