Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into lib-private-master-2 | Thomas Müller | 2013-10-01 | 1 | -1/+6 |
| | |||||
* | move the private namespace OC into lib/private - OCP will stay in lib/public | Thomas Müller | 2013-09-30 | 1 | -0/+208 |
Conflicts: lib/private/vcategories.php |