Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Mon, 31 Jul 2017 15:30:55 +0000 (17:30 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 31 Jul 2017 15:30:55 +0000 (17:30 +0200)
commitb3de6ed984bcc994530c9a12e97229fedf1d837d
tree2119dcbafabf2ff1b3eefcbae0741986ef6c7f48
parentbc3ccfe3fc94a7fd1199c4b502bd5a967428876c
parentfc7d120a5591f75eb6c4287bee8dd29d683d2644
Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:
# wcfsetup/install/files/js/3rdParty/redactor2/plugins/combined.min.js
com.woltlab.wcf/templates/wysiwyg.tpl
wcfsetup/install/files/acp/templates/wysiwyg.tpl