diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2018-11-22 08:49:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-22 08:49:09 +0100 |
| commit | 654880da255d2d8db0eb39a2f8820974036f1cbe (patch) | |
| tree | 550814c55e0a2b4cd6a70532d6e42d823fc957fe /apps | |
| parent | f3fb6676e962255246036dced5499f17a6b71e1c (diff) | |
| parent | a8dafc2ff8259adb18a98c263dc1473aa24e454c (diff) | |
| download | nextcloud-server-654880da255d2d8db0eb39a2f8820974036f1cbe.tar.gz nextcloud-server-654880da255d2d8db0eb39a2f8820974036f1cbe.zip | |
Merge pull request #12468 from nextcloud/multiselect-removal-fix
Remove conflicting multiselect
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/encryption/templates/settings-admin.php | 1 | ||||
| -rw-r--r-- | apps/encryption/templates/settings-personal.php | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/apps/encryption/templates/settings-admin.php b/apps/encryption/templates/settings-admin.php index c5f8d9f5536..39d10490c44 100644 --- a/apps/encryption/templates/settings-admin.php +++ b/apps/encryption/templates/settings-admin.php @@ -2,7 +2,6 @@ /** @var array $_ */ /** @var \OCP\IL10N $l */ script('encryption', 'settings-admin'); -script('core', 'multiselect'); style('encryption', 'settings-admin'); ?> <form id="ocDefaultEncryptionModule" class="sub-section"> diff --git a/apps/encryption/templates/settings-personal.php b/apps/encryption/templates/settings-personal.php index 05a720687aa..41dacc534e6 100644 --- a/apps/encryption/templates/settings-personal.php +++ b/apps/encryption/templates/settings-personal.php @@ -2,7 +2,6 @@ /** @var array $_ */ /** @var \OCP\IL10N $l */ script('encryption', 'settings-personal'); -script('core', 'multiselect'); ?> <form id="ocDefaultEncryptionModule" class="section"> <h2 data-anchor-name="basic-encryption-module"><?php p($l->t('Basic encryption module')); ?></h2> |