summaryrefslogtreecommitdiffstats
path: root/apps/files_external/appinfo/app.php
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-04-21 23:21:50 +0200
committerGeorg Ehrke <dev@georgswebsite.de>2012-04-21 23:21:50 +0200
commit0918fc7d9156f3846a19b673db5b01422a59c506 (patch)
tree131188252fd42c4f3c9673975adafa24783c632f /apps/files_external/appinfo/app.php
parent77cefdedb86de65e69f470c8b6a1b03bb001966e (diff)
parent74e540271122222f650bbbfaeaac310b0e592674 (diff)
downloadnextcloud-server-0918fc7d9156f3846a19b673db5b01422a59c506.tar.gz
nextcloud-server-0918fc7d9156f3846a19b673db5b01422a59c506.zip
fix merge conflicts
Diffstat (limited to 'apps/files_external/appinfo/app.php')
-rw-r--r--apps/files_external/appinfo/app.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index 95770b44b75..784ed032d47 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -9,3 +9,4 @@
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';