summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2013-01-16 19:04:50 +0100
committerRobin Appelman <icewind@owncloud.com>2013-01-16 19:04:50 +0100
commit5445b94416f50bb040e7426cadfa458607893f07 (patch)
tree337b12362333030e0ebda37acb7f25073723a7af /apps/files_encryption
parent7debfac0dc8f602168d8db480cfd4757b4d612b0 (diff)
parent1d57a2e2a9d5e392bb1061479543cd1dec860c4b (diff)
downloadnextcloud-server-5445b94416f50bb040e7426cadfa458607893f07.tar.gz
nextcloud-server-5445b94416f50bb040e7426cadfa458607893f07.zip
merge master into filesystem
Diffstat (limited to 'apps/files_encryption')
-rw-r--r--apps/files_encryption/templates/settings.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_encryption/templates/settings.php b/apps/files_encryption/templates/settings.php
index 268b1a80ccd..61bfe849c72 100644
--- a/apps/files_encryption/templates/settings.php
+++ b/apps/files_encryption/templates/settings.php
@@ -2,7 +2,7 @@
<fieldset class="personalblock">
<legend><strong><?php echo $l->t('Encryption');?></strong></legend>
<input type='checkbox'<?php if ($_['encryption_enabled']): ?> checked="checked"<?php endif; ?>
- id='enable_encryption' ></input>
+ id='enable_encryption' />
<label for='enable_encryption'><?php echo $l->t('Enable Encryption')?></label><br />
<select id='encryption_blacklist' title="<?php echo $l->t('None')?>" multiple="multiple">
<?php foreach ($_['blacklist'] as $type): ?>