From: Alexander Ebert Date: Fri, 14 Jul 2017 15:30:44 +0000 (+0200) Subject: Merge remote-tracking branch 'refs/remotes/origin/3.0' X-Git-Tag: 3.1.0_Alpha_1~269 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fecf163c8f0812540b91f302d2e3614187742c15;p=GitHub%2FWoltLab%2FWCF.git Merge remote-tracking branch 'refs/remotes/origin/3.0' # Conflicts: # wcfsetup/install/files/js/3rdParty/redactor2/plugins/combined.min.js # wcfsetup/install/files/js/3rdParty/redactor2/redactor.min.js --- fecf163c8f0812540b91f302d2e3614187742c15