Commit Graph

3 Commits (dc53c83e7bdbadeb24c74fe1c7794de54811c264)

Author SHA1 Message Date
Morris Jobke 7f47cc062c fix defaults.php doc 2013-11-25 14:13:58 +07:00
Bjoern Schiessle 8b08b1b455 Merge branch 'master' into sharing_mail_notification_master
Conflicts:
	lib/private/util.php
2013-10-02 10:11:18 +07:00
Thomas Müller 9c9dc276b7 move the private namespace OC into lib/private - OCP will stay in lib/public
Conflicts:
	lib/private/vcategories.php
2013-09-30 16:36:59 +07:00