Thomas Mueller 5062ae250b Merge branch 'master' into master-sqlserver ...

Conflicts:
	lib/files/cache/cache.php

2013-02-20 10:55:20 +01:00

..

cache.php

Merge branch 'master' into master-sqlserver

2013-02-20 10:55:20 +01:00

legacy.php

Merge branch 'master' into master-sqlserver

2013-02-14 22:54:48 +01:00

permissions.php

Style-fix: Breakup long lines

2013-02-14 08:38:37 +01:00

scanner.php

Cache: fix scanner trying to use existing data when file isn't in cache

2013-02-12 16:48:21 +01:00

updater.php

Update mtimes of all parent folders after change inside

2013-01-19 21:04:25 -05:00

upgrade.php

Style-fix: Breakup long lines

2013-02-14 08:38:37 +01:00

watcher.php

Filecache Watcher: use scan or scanFile based on the current item, not the cached item

2012-12-15 03:10:56 +01:00