Commit d55c7223 authored 11 years ago by Robin Appelman

Merge branch 'master' into foldersize-reuse

Conflicts:
lib/private/files/cache/homecache.php

No related merge requests found

Showing with 580 additions and 582 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Please register or to comment