summaryrefslogtreecommitdiffstats
path: root/lib/private/defaults.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-021-2/+3
| | | | | Conflicts: lib/private/util.php
* move the private namespace OC into lib/private - OCP will stay in lib/publicThomas Müller2013-09-301-0/+135
Conflicts: lib/private/vcategories.php