]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #5238 from owncloud/externalstorage-owncloudbackend
authorThomas Müller <thomas.mueller@tmit.eu>
Wed, 8 Jan 2014 09:49:15 +0000 (01:49 -0800)
committerThomas Müller <thomas.mueller@tmit.eu>
Wed, 8 Jan 2014 09:49:15 +0000 (01:49 -0800)
Added ownCloud backend for external storage

1  2 
apps/files_external/appinfo/app.php
apps/files_external/lib/config.php
apps/files_external/lib/webdav.php
apps/files_external/tests/config.php

index f78f3abf0fa25f54a1e8cc349d93232a7399fc92,070740fb4d4bbcd6f6628a2c5bd4ecdeb264d7e0..5b1cd86a1709e75f30022413003ca84a48b1f2ef
@@@ -9,8 -9,9 +9,9 @@@
  OC::$CLASSPATH['OC\Files\Storage\StreamWrapper'] = 'files_external/lib/streamwrapper.php';
  OC::$CLASSPATH['OC\Files\Storage\FTP'] = 'files_external/lib/ftp.php';
  OC::$CLASSPATH['OC\Files\Storage\DAV'] = 'files_external/lib/webdav.php';
+ OC::$CLASSPATH['OC\Files\Storage\OwnCloud'] = 'files_external/lib/owncloud.php';
  OC::$CLASSPATH['OC\Files\Storage\Google'] = 'files_external/lib/google.php';
 -OC::$CLASSPATH['OC\Files\Storage\SWIFT'] = 'files_external/lib/swift.php';
 +OC::$CLASSPATH['OC\Files\Storage\Swift'] = 'files_external/lib/swift.php';
  OC::$CLASSPATH['OC\Files\Storage\SMB'] = 'files_external/lib/smb.php';
  OC::$CLASSPATH['OC\Files\Storage\AmazonS3'] = 'files_external/lib/amazons3.php';
  OC::$CLASSPATH['OC\Files\Storage\Dropbox'] = 'files_external/lib/dropbox.php';
Simple merge
Simple merge
Simple merge