diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-01-28 11:18:04 +0100 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-01-28 11:18:04 +0100 |
| commit | 8067a1394e3dab551e65ec8abd12e673a811bf40 (patch) | |
| tree | fd18fac68c7ca62ee50142e771f0da70a9c0925d /apps/files/templates/index.php | |
| parent | dbb0d0407324830f4a7ff51781c535c1cb0d2a06 (diff) | |
| parent | 857b15db3739fe8fbbad4df0f10e9b48ba1f90c2 (diff) | |
| download | nextcloud-server-8067a1394e3dab551e65ec8abd12e673a811bf40.tar.gz nextcloud-server-8067a1394e3dab551e65ec8abd12e673a811bf40.zip | |
fix merge conflicts
Diffstat (limited to 'apps/files/templates/index.php')
| -rw-r--r-- | apps/files/templates/index.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index f6b4c29d5a2..2d4ed9ab2d9 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -54,7 +54,6 @@ <?php endif;?> <input type="hidden" name="permissions" value="<?php echo $_['permissions']; ?>" id="permissions"> </div> -<div id='notification'></div> <?php if (isset($_['files']) and $_['isCreatable'] and count($_['files'])==0):?> <div id="emptyfolder"><?php echo $l->t('Nothing in here. Upload something!')?></div> @@ -119,3 +118,4 @@ <!-- config hints for javascript --> <input type="hidden" name="allowZipDownload" id="allowZipDownload" value="<?php echo $_['allowZipDownload']; ?>" /> +<input type="hidden" name="usedSpacePercent" id="usedSpacePercent" value="<?php echo $_['usedSpacePercent']; ?>" /> |