summaryrefslogtreecommitdiffstats
path: root/lib/private/ocsclient.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into lib-private-master-2Thomas Müller2013-10-011-1/+6
|
* move the private namespace OC into lib/private - OCP will stay in lib/publicThomas Müller2013-09-301-0/+208
Conflicts: lib/private/vcategories.php