diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-07-27 11:40:51 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-07-27 11:40:51 +0200 |
| commit | a7a54331082c41c5b05cd7982c058caf1556f777 (patch) | |
| tree | bc51551c2430837856cdb1f3a1e04c46e0f664cb /apps/files/ajax/download.php | |
| parent | e8010209bb1ec8ef9ecc1cff7ac2b2d4d414bd74 (diff) | |
| parent | d26f87e738314db7820f39f74f42865ff20f7bd7 (diff) | |
| download | nextcloud-server-a7a54331082c41c5b05cd7982c058caf1556f777.tar.gz nextcloud-server-a7a54331082c41c5b05cd7982c058caf1556f777.zip | |
Merge branch 'master' into chunked_upload
Conflicts:
lib/connector/sabre/directory.php
Diffstat (limited to 'apps/files/ajax/download.php')
| -rw-r--r-- | apps/files/ajax/download.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/apps/files/ajax/download.php b/apps/files/ajax/download.php index e9373f5f6ac..b9a4ddaf5e7 100644 --- a/apps/files/ajax/download.php +++ b/apps/files/ajax/download.php @@ -34,4 +34,3 @@ $files = $_GET["files"]; $dir = $_GET["dir"]; OC_Files::get($dir, $files, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); -?> |