diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2013-01-09 21:49:21 -0500 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-01-09 21:49:21 -0500 |
| commit | fbcf62389c195410def29e04b9e515324d0a128f (patch) | |
| tree | 19c01805ed2c6937e676eb40cc2d537ef0135a6f /apps/files_external/lib/webdav.php | |
| parent | 78043d73e83b95b0d1328598f59a1a65707f4ca6 (diff) | |
| parent | 912050afa0bd963fdde7d7b223c32bb9bd8e1479 (diff) | |
| download | nextcloud-server-fbcf62389c195410def29e04b9e515324d0a128f.tar.gz nextcloud-server-fbcf62389c195410def29e04b9e515324d0a128f.zip | |
Merge branch 'master' into external_storage_ui_feedback
Conflicts:
apps/files_external/lib/webdav.php
Diffstat (limited to 'apps/files_external/lib/webdav.php')
| -rw-r--r-- | apps/files_external/lib/webdav.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php index 31d36f1e78b..c3a0c1482dc 100644 --- a/apps/files_external/lib/webdav.php +++ b/apps/files_external/lib/webdav.php @@ -51,7 +51,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{ 'password' => $this->password, ); - $this->client = new OC_Connector_Sabre_Client($settings); + $this->client = new Sabre_DAV_Client($settings); $caview = \OCP\Files::getStorage('files_external'); if ($caview) { |