Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Fri, 14 Jul 2017 15:30:44 +0000 (17:30 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 14 Jul 2017 15:30:44 +0000 (17:30 +0200)
commitfecf163c8f0812540b91f302d2e3614187742c15
tree893043eac8843c4292ba8ad9e34110dc8693909b
parent6f08052fbf86b432c620d834f916b08d681c6f9a
parent89c8fbe2411d1426bafeb8a91c73cf502646e4ca
Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:
# wcfsetup/install/files/js/3rdParty/redactor2/plugins/combined.min.js
# wcfsetup/install/files/js/3rdParty/redactor2/redactor.min.js
com.woltlab.wcf/templates/pageMenuMobile.tpl
wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php