Bart Visscher f569c721a6 Merge branch 'master' into optimize-startup-queries ... Conflicts: apps/files_sharing/lib/sharedstorage.php tests/lib/group/manager.php removed hasFilesSharedWith from lib/public/share.php and sharedstorage.php to fix merge		2014-05-07 17:54:38 +02:00
..
backend.php	Scrutinizer Auto-Fixes	2014-02-19 09:31:54 +01:00
database.php	Scrutinizer Auto-Fixes	2014-02-19 09:31:54 +01:00
dummy.php	adding space between) and {	2012-09-07 15:22:01 +02:00
group.php	adjust tests accordingly	2014-04-15 17:53:57 +02:00
manager.php	Merge branch 'master' into optimize-startup-queries	2014-05-07 17:54:38 +02:00