summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into lib-private-master-2Thomas Müller2013-10-013-7/+51
|
* Merge branch 'master' into lib-private-master-2Thomas Müller2013-09-301-0/+22
|
* reorganize file in libThomas Müller2013-09-303-0/+811
|
* move the private namespace OC into lib/private - OCP will stay in lib/publicThomas Müller2013-09-30307-0/+38567
Conflicts: lib/private/vcategories.php