Michael Gapczynski 30b58f5677 Merge branch 'master' into share_api ... Conflicts: apps/calendar/js/loader.js apps/contacts/index.php apps/contacts/js/loader.js apps/files/js/files.js apps/files_sharing/sharedstorage.php lib/filesystemview.php		2012-07-25 17:08:18 -04:00
..
amazons3.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00
config.php	split share and root config for smb backend, also sanitize config a bit more	2012-06-08 01:29:55 +02:00
ftp.php	remove unused variables	2012-07-20 18:56:18 +02:00
google.php	remove unused variables	2012-07-20 18:56:18 +02:00
smb.php	remove unused variables	2012-07-20 18:56:18 +02:00
swift.php	remove unused variables	2012-07-20 18:56:18 +02:00
test.php	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00
webdav.php	remove unused variables	2012-07-20 18:56:18 +02:00