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
..
cache	append .part to put files	2013-02-10 14:16:45 +01:00
storage	Merge branch 'master' into external_storage_ui_feedback	2013-02-11 20:27:05 -05:00
stream	add oc:// streamwrapper to provide access to ownCloud's virtual filesystem	2013-01-28 15:35:30 +01:00
filesystem.php	Proper fix for shared links	2013-02-10 19:09:58 -05:00
mapper.php	Mapper: use md5 hashes for database indexes	2013-02-10 11:49:37 +01:00
mount.php	Filesystem: return all matching mounts in Mount::findById	2013-01-28 00:59:43 +01:00
view.php	know your libraries ;-)	2013-02-09 13:51:44 +01:00