From: Alexander Ebert Date: Tue, 7 Jul 2015 12:09:16 +0000 (+0200) Subject: Merge branch 'master' into next X-Git-Tag: 3.0.0_Beta_1~2219^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=488643bc27bbf802ecddabdec0e2b2a05d16df34;p=GitHub%2FWoltLab%2FWCF.git Merge branch 'master' into next Conflicts: wcfsetup/install/files/js/3rdParty/redactor/plugins/wcombined.min.js wcfsetup/install/files/js/WCF.Combined.min.js --- 488643bc27bbf802ecddabdec0e2b2a05d16df34