aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/cache/file.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into fixing-4546-masterThomas Müller2013-10-071-0/+18
| | | | | Conflicts: lib/private/connector/sabre/directory.php
* move the private namespace OC into lib/private - OCP will stay in lib/publicThomas Müller2013-09-301-0/+118
Conflicts: lib/private/vcategories.php