diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-10-22 14:35:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-22 14:35:07 +0200 |
| commit | 1be6213ba46e5f3aaac9cfe62c988a60c291fec1 (patch) | |
| tree | 711297e64bbbaa23bb7fb864a972401a66dce9e5 /settings | |
| parent | 038d02a27d41a50a759962759d6701ebfe9db46d (diff) | |
| parent | 3e5e07aa64f94bea528450d810249c74d0f8c03f (diff) | |
| download | nextcloud-server-1be6213ba46e5f3aaac9cfe62c988a60c291fec1.tar.gz nextcloud-server-1be6213ba46e5f3aaac9cfe62c988a60c291fec1.zip | |
Merge pull request #1832 from nextcloud/select2-into-core
Select2 into core
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/templates/admin/frame.php | 2 | ||||
| -rw-r--r-- | settings/templates/apps.php | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/settings/templates/admin/frame.php b/settings/templates/admin/frame.php index 1d9f6dc7a78..761d76c4434 100644 --- a/settings/templates/admin/frame.php +++ b/settings/templates/admin/frame.php @@ -25,8 +25,6 @@ style('settings', 'settings'); script('settings', [ 'settings', 'admin', 'log', 'certificates'] ); script('core', ['multiselect', 'setupchecks']); script('files', 'jquery.fileupload'); -vendor_script('select2/select2'); -vendor_style('select2/select2'); ?> diff --git a/settings/templates/apps.php b/settings/templates/apps.php index ea62acd9945..46fd5bd0e40 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -1,16 +1,9 @@ <?php style('settings', 'settings'); -vendor_style( - 'core', - [ - 'select2/select2', - ] -); vendor_script( 'core', [ - 'handlebars/handlebars', - 'select2/select2' + 'handlebars/handlebars' ] ); script( |