summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-01-21 15:35:32 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2014-01-21 15:35:32 +0100
commit262f221d1119222825a0fbf5d26623f567bd00dd (patch)
tree0000ba341d2814871b17236f82a04a30fa928a62 /lib
parent23a4d0d44ef8b918f054e7ad608d04b2e9a68995 (diff)
parent98415d68a5127bc0928455ecff230f53cf990686 (diff)
downloadnextcloud-server-262f221d1119222825a0fbf5d26623f567bd00dd.tar.gz
nextcloud-server-262f221d1119222825a0fbf5d26623f567bd00dd.zip
Merge branch 'master' into fix-setupfs-only-for-existing-users-master
Diffstat (limited to 'lib')
-rw-r--r--lib/private/files.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/files.php b/lib/private/files.php
index e6c81d58bd2..8ce632013cf 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -83,7 +83,7 @@ class OC_Files {
if ($basename) {
$name = $basename . '.zip';
} else {
- $name = 'owncloud.zip';
+ $name = 'download.zip';
}
set_time_limit($executionTime);