Michael Gapczynski 6801f82d09 Merge branch 'filesystem' into filesystem-etags ... Conflicts: lib/files/cache/cache.php		2013-01-07 10:28:37 -05:00
..
auth.php	implement getCurrentUser in Sabre Auth Connector, fixes #508	2012-12-14 01:06:09 +01:00
client.php	EOL fixes	2012-09-07 14:10:00 +02:00
directory.php	Use etags from file cache in SabreDAV connector	2012-12-30 19:18:05 -05:00
file.php	Checkstyle fixes: NoSpaceAfterComma	2012-11-04 11:10:46 +01:00
locks.php	Checkstyle fixes: NoSpaceAfterComma	2012-11-04 11:10:46 +01:00
node.php	Remove old etag code	2012-12-30 19:23:31 -05:00
principal.php	Checkstyle: many fixes	2012-11-02 19:53:02 +01:00
quotaplugin.php	merge master into filesystem	2013-01-07 00:16:10 +01:00