Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into fixing-4546-master | Thomas Müller | 2013-10-07 | 1 | -0/+18 |
| | | | | | Conflicts: lib/private/connector/sabre/directory.php | ||||
* | move the private namespace OC into lib/private - OCP will stay in lib/public | Thomas Müller | 2013-09-30 | 1 | -0/+118 |
Conflicts: lib/private/vcategories.php |