Thomas Mueller c975f0f63d Merge branch 'master' into ocs_capabilities ... Conflicts: lib/ocs/cloud.php		2013-01-31 23:45:02 +01:00
..
providers.php	add multiple domains reverse proxy support	2013-01-31 18:42:31 +01:00
routes.php	Add new /cloud/capabilities route and remove unused methods	2013-01-16 20:43:46 +00:00
v1.php	Merge master into ocs_api, fix conflicts.	2012-12-14 15:15:05 +00:00