diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2013-02-19 19:12:14 -0500 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-02-19 19:12:14 -0500 |
| commit | 702c27b0e63cddb21f483c0a69e899e08b42ec07 (patch) | |
| tree | 5235c4b45c2de00c9d5633e25ad5142388587f1f /apps/files_external/lib/amazons3.php | |
| parent | 037c3ee4ecf6f3ffae0f1707074ac13b234dc1ec (diff) | |
| parent | 38782036798dbe0a34995a3fca0aa92583cb9099 (diff) | |
| download | nextcloud-server-702c27b0e63cddb21f483c0a69e899e08b42ec07.tar.gz nextcloud-server-702c27b0e63cddb21f483c0a69e899e08b42ec07.zip | |
Merge branch 'master' into external_storage_ui_feedback
Conflicts:
apps/files_external/js/settings.js
apps/files_external/lib/smb.php
apps/files_external/templates/settings.php
lib/files/storage/common.php
Diffstat (limited to 'apps/files_external/lib/amazons3.php')
| -rw-r--r-- | apps/files_external/lib/amazons3.php | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php index d00e9a08231..7bcefd4176c 100644 --- a/apps/files_external/lib/amazons3.php +++ b/apps/files_external/lib/amazons3.php @@ -233,11 +233,6 @@ class AmazonS3 extends \OC\Files\Storage\Common { return false; } - public function free_space($path) { - // Infinite? - return false; - } - public function touch($path, $mtime = null) { if (is_null($mtime)) { $mtime = time(); |