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
..
broker.php	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00
file.php	Merge branch 'master' into fixing-4546-master	2013-10-07 17:47:54 +02:00
fileglobal.php	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00
fileglobalgc.php	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00
usercache.php	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00