Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Mon, 11 Sep 2017 12:13:10 +0000 (14:13 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 11 Sep 2017 12:13:10 +0000 (14:13 +0200)
commitdb501d92ad878c4fbc097dbb04898e77c131882d
tree7e1057cc341dbbd5176137dbe00756599c5c4b25
parent10405f69c98635c7149bc6badfd3452c1f1db5e4
parent183dea049e339f7a5110263d4910a4cf6c3b50b2
Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:
# com.woltlab.wcf/package.xml
# wcfsetup/install/files/js/3rdParty/redactor2/plugins/combined.min.js
# wcfsetup/install/files/js/WCF.Combined.min.js
# wcfsetup/install/files/js/WoltLabSuite.Core.min.js
# wcfsetup/install/files/lib/system/WCF.class.php