Thomas Müller 5e397d89c4 Merge branch 'master' into fixing-4546-master ... Conflicts: lib/private/connector/sabre/directory.php		2013-10-07 17:47:54 +02:00
..
ServiceUnavailable.php	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00
aborteduploaddetectionplugin.php	upload abortion detection only for PUT	2013-10-04 20:20:33 +02:00
auth.php	code cleanup - remove special case for webdav in handleApacheAuth()	2013-10-02 00:55:35 +02:00
directory.php	Merge branch 'master' into fixing-4546-master	2013-10-07 17:47:54 +02:00
file.php	Merge branch 'master' into fixing-4011-master	2013-10-04 14:06:42 +02:00
locks.php	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00
maintenanceplugin.php	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00
node.php	Merge branch 'master' into fixing-4011-master	2013-10-04 14:06:42 +02:00
objecttree.php	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00
principal.php	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00
quotaplugin.php	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00
request.php	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00