Tom Needham 5fe6129698 Merge master into ocs_api, fix conflicts.		2012-12-14 15:15:05 +00:00
..
share	Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_*	2012-11-11 23:10:23 +01:00
api.php	External Share API: Move url down one level in response	2012-10-31 11:31:19 +00:00
sharedstorage.php	Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_*	2012-11-11 23:10:23 +01:00