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
..
archive	removing executable bit - again	2012-05-15 00:52:00 +02:00
cache	use dummy user backend for oc_cache_file tests	2012-07-23 22:32:07 +02:00
filestorage	tests for oc_filesystem	2012-04-12 15:55:56 +02:00
group	allow multiply group backends	2012-04-13 01:59:05 +02:00
share	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00
user	remove unused variables	2012-07-20 18:56:18 +02:00
archive.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
cache.php	add prefix option to OC_Cache::clear	2012-07-22 02:31:48 +02:00
filestorage.php	add hasUpdated to oc_filestorage	2012-06-15 16:43:24 +02:00
filesystem.php	tests for oc_filesystem	2012-04-12 15:55:56 +02:00
group.php	allow multiply group backends	2012-04-13 01:59:05 +02:00
streamwrappers.php	add streamwrapper that provides a callback on stream close	2012-03-02 18:42:57 +01:00