Merge branch 'refs/heads/21-qr' into 30-qr
authorAlexander Ebert <ebert@woltlab.com>
Sun, 11 Mar 2018 17:42:33 +0000 (18:42 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 11 Mar 2018 17:42:33 +0000 (18:42 +0100)
commit4bb4e522af740ac9de240b7237ff53e889b3dd7a
tree0c09984d9051c58f17a43ee2f430da93c4c2c9f6
parent8b3df20400a1f2325d3262967182c7f8ecdd6ed1
parentf7ca0182cfb73bd946f5e0a6097285a6f6cf0017
Merge branch 'refs/heads/21-qr' into 30-qr

# Conflicts:
# wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php
wcfsetup/install/files/lib/data/IMessageQuickReplyParametersAction.class.php
wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php