Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Wed, 13 Sep 2017 11:53:50 +0000 (13:53 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 13 Sep 2017 11:53:50 +0000 (13:53 +0200)
commitdfd3797185146144fadca30242f778abb455f859
treeab1e3b0a3001142955be72c8dd1c6dbc5f8a5704
parentd2b9033bca80e5bbe08fd14b75b5ed2817daed7e
parentd7933b8f1e6ee5e9c9f9fdfbe4344c3f2c6ec39b
Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:
# wcfsetup/install/files/acp/templates/applicationEdit.tpl
# wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js
# wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php
wcfsetup/install/files/acp/templates/applicationEdit.tpl
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dropdown/Simple.js
wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php