Tom Needham 5fe6129698 Merge master into ocs_api, fix conflicts.		12 years ago
..
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.	13 years ago
routes.php	API: Tidy up routes.php, remove redundant call registration	12 years ago
v1.php	Merge master into ocs_api, fix conflicts.	12 years ago