Michael Gapczynski 4c7fd8cd01 Merge branch 'master' into share_api ... Conflicts: lib/group.php lib/group/backend.php lib/group/database.php lib/group/interface.php lib/public/user.php lib/user.php lib/user/backend.php lib/user/database.php lib/user/interface.php		2012-08-14 10:22:13 -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	Improve usability for configuring Dropbox and Google Drive external storage	2012-08-13 17:10:58 -04:00
dropbox.php	Merge branch 'master' into share_api	2012-08-14 10:22:13 -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-08-14 10:22:13 -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