diff options
| author | Henrik Kjölhede <hkjolhede@gmail.com> | 2013-02-09 14:05:33 +0100 |
|---|---|---|
| committer | Henrik Kjölhede <hkjolhede@gmail.com> | 2013-02-09 14:05:33 +0100 |
| commit | 41fa65e7befb249e260f2dd91e33971261cfd302 (patch) | |
| tree | 4ebb4cb10f7869ba3288308ca3a35ce53970ed40 /apps/files_external/appinfo/app.php | |
| parent | b1b2eafa50db54b2613cf2bc52bfab2015d67b2f (diff) | |
| parent | ec829bd345045df985f623fa2fe6587d0ce68eb2 (diff) | |
| download | nextcloud-server-41fa65e7befb249e260f2dd91e33971261cfd302.tar.gz nextcloud-server-41fa65e7befb249e260f2dd91e33971261cfd302.zip | |
Merge branch 'master' of https://github.com/owncloud/core
Conflicts:
apps/files_external/appinfo/app.php
Diffstat (limited to 'apps/files_external/appinfo/app.php')
| -rw-r--r-- | apps/files_external/appinfo/app.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php index cafd0637b8c..d976c017523 100644 --- a/apps/files_external/appinfo/app.php +++ b/apps/files_external/appinfo/app.php @@ -6,15 +6,15 @@ * See the COPYING-README file. */ -OC::$CLASSPATH['OC_FileStorage_StreamWrapper']='apps/files_external/lib/streamwrapper.php'; -OC::$CLASSPATH['OC_Filestorage_FTP']='apps/files_external/lib/ftp.php'; -OC::$CLASSPATH['OC_Filestorage_DAV']='apps/files_external/lib/webdav.php'; -OC::$CLASSPATH['OC_Filestorage_Google']='apps/files_external/lib/google.php'; -OC::$CLASSPATH['OC_Filestorage_SWIFT']='apps/files_external/lib/swift.php'; -OC::$CLASSPATH['OC_Filestorage_SMB']='apps/files_external/lib/smb.php'; -OC::$CLASSPATH['OC_Filestorage_AmazonS3']='apps/files_external/lib/amazons3.php'; -OC::$CLASSPATH['OC_Filestorage_Dropbox']='apps/files_external/lib/dropbox.php'; -OC::$CLASSPATH['OC_Filestorage_SFTP']='apps/files_external/lib/sftp.php'; +OC::$CLASSPATH['OC\Files\Storage\StreamWrapper']='apps/files_external/lib/streamwrapper.php'; +OC::$CLASSPATH['OC\Files\Storage\FTP']='apps/files_external/lib/ftp.php'; +OC::$CLASSPATH['OC\Files\Storage\DAV']='apps/files_external/lib/webdav.php'; +OC::$CLASSPATH['OC\Files\Storage\Google']='apps/files_external/lib/google.php'; +OC::$CLASSPATH['OC\Files\Storage\SWIFT']='apps/files_external/lib/swift.php'; +OC::$CLASSPATH['OC\Files\Storage\SMB']='apps/files_external/lib/smb.php'; +OC::$CLASSPATH['OC\Files\Storage\AmazonS3']='apps/files_external/lib/amazons3.php'; +OC::$CLASSPATH['OC\Files\Storage\Dropbox']='apps/files_external/lib/dropbox.php'; +OC::$CLASSPATH['OC\Files\Storage\SFTP']='apps/files_external/lib/sftp.php'; OC::$CLASSPATH['OC_Mount_Config']='apps/files_external/lib/config.php'; OCP\App::registerAdmin('files_external', 'settings'); |