Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Wed, 18 Oct 2017 09:29:19 +0000 (11:29 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 18 Oct 2017 09:29:19 +0000 (11:29 +0200)
commit092221ca275b258532a8fa16e93a4597e43d9fc0
tree601495f95406fe055160910f979412fd50438152
parent656e19d23f90e3ff7984b835f4f173a73c18869f
parentea15590643b8f973d140e9c659d3e3890e18531c
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/lib/system/WCF.class.php