aboutsummaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2018-11-22 08:49:09 +0100
committerGitHub <noreply@github.com>2018-11-22 08:49:09 +0100
commit654880da255d2d8db0eb39a2f8820974036f1cbe (patch)
tree550814c55e0a2b4cd6a70532d6e42d823fc957fe /settings
parentf3fb6676e962255246036dced5499f17a6b71e1c (diff)
parenta8dafc2ff8259adb18a98c263dc1473aa24e454c (diff)
downloadnextcloud-server-654880da255d2d8db0eb39a2f8820974036f1cbe.tar.gz
nextcloud-server-654880da255d2d8db0eb39a2f8820974036f1cbe.zip
Merge pull request #12468 from nextcloud/multiselect-removal-fix
Remove conflicting multiselect
Diffstat (limited to 'settings')
-rw-r--r--settings/templates/settings/frame.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/templates/settings/frame.php b/settings/templates/settings/frame.php
index a4f44294ad0..1734a92b064 100644
--- a/settings/templates/settings/frame.php
+++ b/settings/templates/settings/frame.php
@@ -23,7 +23,7 @@
style('settings', 'settings');
script('settings', [ 'settings', 'admin', 'log', 'certificates'] );
-script('core', ['multiselect', 'setupchecks']);
+script('core', 'setupchecks');
script('files', 'jquery.fileupload');
?>