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)
# Conflicts:
# wcfsetup/install/files/js/3rdParty/redactor2/plugins/combined.min.js
# wcfsetup/install/files/js/3rdParty/redactor2/redactor.min.js

1  2 
com.woltlab.wcf/templates/pageMenuMobile.tpl
wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php