Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Thu, 6 Jul 2017 11:55:17 +0000 (13:55 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 6 Jul 2017 11:55:17 +0000 (13:55 +0200)
commit9404a7d8880ab8ba092e774600a6495f4b04d59b
tree8d3a113a1a5d18842249ff445249d6a9f3dc9210
parent60239287ec8ae8076a25746dc957168a820aadd2
parentd88694cc0de12d7e9860f77106973e12db23c6a0
Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:
# com.woltlab.wcf/templates/wysiwyg.tpl
# wcfsetup/install/files/js/3rdParty/redactor2/plugins/combined.min.js
# wcfsetup/install/files/js/WoltLabSuite.Core.min.js
com.woltlab.wcf/templates/wysiwyg.tpl
wcfsetup/install/files/acp/templates/userGroupOption.tpl
wcfsetup/install/files/acp/templates/wysiwyg.tpl
wcfsetup/install/files/js/WoltLabSuite/Core/Environment.js
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js
wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php
wcfsetup/install/files/lib/page/AbstractArticlePage.class.php