Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Sat, 11 Nov 2017 09:08:21 +0000 (10:08 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 11 Nov 2017 09:08:21 +0000 (10:08 +0100)
commitde3d500512dde11044279d9a8b3684f169e35088
tree1a5e65e4e8af9fe4630acc1d31754c31c56e326e
parent6d60a6f07cf037d3ef44b53764534c3fb69fa1aa
parentfc49b6d1a7e7d56b4a8684b507ff674780c7170b
Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:
# 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/wysiwyg.tpl
wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabKeydown.js