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		13 years ago
..
data	…
lib	Merge branch 'master' into share_api	13 years ago
index.php	fix running test cases from browser	13 years ago