Michael Gapczynski 6eba790a75 Merge branch 'master' into external_storage_ui_feedback ... Conflicts: apps/files_external/js/dropbox.js apps/files_external/js/google.js apps/files_external/js/settings.js apps/files_external/lib/amazons3.php apps/files_external/lib/dropbox.php apps/files_external/lib/google.php apps/files_external/lib/smb.php apps/files_external/lib/swift.php apps/files_external/lib/webdav.php lib/filestorage.php		2013-02-11 20:27:05 -05:00
..
amazons3.php	Merge branch 'master' into external_storage_ui_feedback	2013-02-11 20:27:05 -05:00
config.php	Merge branch 'master' into external_storage_ui_feedback	2013-02-11 20:27:05 -05:00
dropbox.php	Move streamwrappers to seperate files and put them in a namespace	2013-01-28 15:34:15 +01:00
ftp.php	Merge branch 'master' into external_storage_ui_feedback	2013-02-11 20:27:05 -05:00
google.php	Merge branch 'master' into external_storage_ui_feedback	2013-02-11 20:27:05 -05:00
sftp.php	Final changes from icewind1991	2013-02-10 13:11:29 +01:00
smb.php	Merge branch 'master' into external_storage_ui_feedback	2013-02-11 20:27:05 -05:00
streamwrapper.php	merge master into filesystem	2012-12-03 18:02:22 +01:00
swift.php	Merge branch 'master' into external_storage_ui_feedback	2013-02-11 20:27:05 -05:00
webdav.php	Merge branch 'master' into external_storage_ui_feedback	2013-02-11 20:27:05 -05:00