Michael Gapczynski 94ce8f2168 Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/app.php apps/files_sharing/js/share.js		2012-07-31 15:00:04 -04:00
..
amazons3.php	Add CRUDS permissions calls to filesystem, deprecate is_readable() and is_writable()	2012-07-24 20:10:28 -04:00
config.php	allow user to upload his own root certificate for secure webdav mount	2012-07-06 15:58:38 +02:00
dropbox.php	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00
dropboxtest.php	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00
ftp.php	Only call mkdir() if the root folder does not exist for FTP external storage	2012-07-27 12:32:03 -04:00
google.php	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00
googletest.php	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00
smb.php	remove unused variables	2012-07-20 18:56:18 +02:00
streamwrapper.php	Add CRUDS permissions calls to filesystem, deprecate is_readable() and is_writable()	2012-07-24 20:10:28 -04:00
swift.php	Add CRUDS permissions calls to filesystem, deprecate is_readable() and is_writable()	2012-07-24 20:10:28 -04:00
webdav.php	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00