Thomas Müller c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches ... Conflicts: lib/private/migration/content.php		2014-02-18 18:31:33 +01: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	polish documentation based on scrutinizer patches	2014-02-06 17:02:21 +01:00
fileglobal.php	Merge branch 'master' into scrutinizer_documentation_patches	2014-02-18 18:31:33 +01: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