diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-10-02 10:11:18 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-10-02 10:11:18 +0200 |
| commit | 8b08b1b455b474de3fa376dfafa3de63727364ea (patch) | |
| tree | 536b2d4ba4f979d69f4f6e73755e06635345f78a /apps/files/templates | |
| parent | 084f76fd14125023d5b7277c558eb86a20ea07d3 (diff) | |
| parent | 535ed8369f701a184340a428e82cc8d7cc7588bb (diff) | |
| download | nextcloud-server-8b08b1b455b474de3fa376dfafa3de63727364ea.tar.gz nextcloud-server-8b08b1b455b474de3fa376dfafa3de63727364ea.zip | |
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
lib/private/util.php
Diffstat (limited to 'apps/files/templates')
| -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 09bd96be526..35077e7dc1a 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -47,7 +47,7 @@ <input type="hidden" name="permissions" value="<?php p($_['permissions']); ?>" id="permissions"> </div> -<div id="emptycontent" <?php if (!isset($_['files']) or !$_['isCreatable'] or count($_['files']) > 0 or !$_['ajaxLoad']):?>class="hidden"<?php endif; ?>><?php p($l->t('Nothing in here. Upload something!'))?></div> +<div id="emptycontent" <?php if (!isset($_['files']) or !$_['isCreatable'] or count($_['files']) > 0 or $_['ajaxLoad']):?>class="hidden"<?php endif; ?>><?php p($l->t('Nothing in here. Upload something!'))?></div> <input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>"></input> |