diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2013-08-29 10:50:55 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2013-08-29 10:50:55 +0200 |
| commit | b7758d0f8d52b2f9653cfee549558327c00c8e01 (patch) | |
| tree | 309fb713ed25f35f746c59c668521bf9023bc331 /ocs/routes.php | |
| parent | 70b6e2161ec654f7049027bf6dc5072c1eda4d5e (diff) | |
| parent | ea6e74ca9546ca95b3a6372c6106cd8ab2ea2ee9 (diff) | |
| download | nextcloud-server-b7758d0f8d52b2f9653cfee549558327c00c8e01.tar.gz nextcloud-server-b7758d0f8d52b2f9653cfee549558327c00c8e01.zip | |
Merge master into oc_preview
Diffstat (limited to 'ocs/routes.php')
| -rw-r--r-- | ocs/routes.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ocs/routes.php b/ocs/routes.php index 1ea698c7a83..283c9af6924 100644 --- a/ocs/routes.php +++ b/ocs/routes.php @@ -28,7 +28,7 @@ OC_API::register( array('OC_OCS_Activity', 'activityGet'), 'core', OC_API::USER_AUTH - ); + ); // Privatedata OC_API::register( 'get', @@ -75,3 +75,10 @@ OC_API::register( 'core', OC_API::USER_AUTH ); +OC_API::register( + 'get', + '/cloud/users/{userid}', + array('OC_OCS_Cloud', 'getUser'), + 'core', + OC_API::USER_AUTH + ); |