Robin Appelman c9f3f2874f Merge branch 'master' into update-parent-storage-mtime ... Conflicts: lib/private/files/cache/updater.php		2013-10-30 13:41:10 +01:00
..
backgroundwatcher.php	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00
cache.php	Map empty mimetypes to octet-stream for Oracle DBMS.	2013-10-29 14:18:42 +01:00
legacy.php	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00
permissions.php	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00
scanner.php	Catch duplicate insertion errors while scanning files	2013-10-23 13:00:46 +02:00
storage.php	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00
updater.php	Merge branch 'master' into update-parent-storage-mtime	2013-10-30 13:41:10 +01:00
upgrade.php	only perform files upgrade in case there are actually entries in the old fscache table	2013-10-02 13:00:05 +02:00
watcher.php	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00