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
..
common.php	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00
commontest.php	add search implementation to filestorage common	2012-03-02 18:42:57 +01:00
local.php	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00
temporary.php	add temporary filestorage backend for testing purposed	2012-05-11 20:33:56 +02:00