Tom Needham 5fe6129698 Merge master into ocs_api, fix conflicts.		2012-12-14 15:15:05 +00:00
..
providers.php	make it possible to manually override the hostname and protocol if the automatic detection from ownCloud fails. This can happen in reverse proxy situations or with loadbalancers setups.	2012-11-22 19:22:00 +01:00
routes.php	API: Tidy up routes.php, remove redundant call registration	2012-12-14 14:55:02 +00:00
v1.php	Merge master into ocs_api, fix conflicts.	2012-12-14 15:15:05 +00:00