diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-10-04 12:30:49 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-10-04 12:30:49 +0200 |
| commit | 51295e9a6b9cd8e351132e988858b5d4bd223968 (patch) | |
| tree | 7d2da02957552a8ac49eb6f2f3bd6b08e1049406 /apps/files/templates | |
| parent | a223cf769a670c1c8926baf4ded445af300d056d (diff) | |
| parent | 514d7a884a5211fe246487421ea8103202d004d7 (diff) | |
| download | nextcloud-server-51295e9a6b9cd8e351132e988858b5d4bd223968.tar.gz nextcloud-server-51295e9a6b9cd8e351132e988858b5d4bd223968.zip | |
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
apps/files/index.php
apps/files/templates/index.php
Diffstat (limited to 'apps/files/templates')
| -rw-r--r-- | apps/files/templates/index.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index e578a1f563c..7067b854f50 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -116,4 +116,5 @@ <input type="hidden" name="allowZipDownload" id="allowZipDownload" value="<?php p($_['allowZipDownload']); ?>" /> <input type="hidden" name="usedSpacePercent" id="usedSpacePercent" value="<?php p($_['usedSpacePercent']); ?>" /> <input type="hidden" name="encryptedFiles" id="encryptedFiles" value="<?php $_['encryptedFiles'] ? p('1') : p('0'); ?>" /> +<input type="hidden" name="encryptedInitStatus" id="encryptionInitStatus" value="<?php p($_['encryptionInitStatus']) ?>" /> <input type="hidden" name="mailNotificationEnabled" id="mailNotificationEnabled" value="<?php p($_['mailNotificationEnabled']) ?>" /> |