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
..
l10n	[tx-robot] updated from transifex	2014-05-05 01:55:47 -04:00
private	Merge branch 'master' into optimize-startup-queries	2014-05-07 17:54:38 +02:00
public	Some expected Sabre exceptions are now logged with DEBUG level	2014-05-07 11:43:50 +02:00
autoloader.php	Allow null as cache parameter (if no cache was found) and for cache removal.	2013-10-22 11:17:15 +02:00
base.php	Merge pull request #8171 from owncloud/fix-import	2014-05-02 22:43:19 +02:00