diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-08-30 21:49:28 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-08-30 21:49:28 +0200 |
| commit | b483f2aab856e3324026588a9702043072fd7ad2 (patch) | |
| tree | 9a5696d43ae53160bee592e1b6874185cbd98ad4 /lib/ocs.php | |
| parent | cbaf858dea0f2094805edb6aa223bdd6877fff5b (diff) | |
| parent | 598815b21e94219eb66684c64802e165a35180ad (diff) | |
| download | nextcloud-server-b483f2aab856e3324026588a9702043072fd7ad2.tar.gz nextcloud-server-b483f2aab856e3324026588a9702043072fd7ad2.zip | |
Merge branch 'master' into routing
Conflicts:
apps/contacts/js/contacts.js
apps/contacts/lib/search.php
apps/files_archive/js/archive.js
apps/gallery/lib/tiles.php
apps/gallery/templates/index.php
lib/ocs.php
Diffstat (limited to 'lib/ocs.php')
| -rw-r--r-- | lib/ocs.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/ocs.php b/lib/ocs.php index 1df08df9fa1..64e89648e1b 100644 --- a/lib/ocs.php +++ b/lib/ocs.php @@ -177,7 +177,7 @@ class OC_OCS { ->requirements(array('format'=>'xml|json')); // CLOUD - // systemWebApps + // systemWebApps $router->create('system_webapps', '/cloud/system/webapps.{format}') ->defaults(array('format' => $format)) @@ -187,7 +187,7 @@ class OC_OCS { }) ->requirements(array('format'=>'xml|json')); - // quotaget + // quotaget $router->create('quota_get', '/cloud/user/{user}.{format}') ->defaults(array('format' => $format)) @@ -197,7 +197,7 @@ class OC_OCS { OC_OCS::quotaGet($format, $user); }) ->requirements(array('format'=>'xml|json')); - // quotaset + // quotaset $router->create('quota_set', '/cloud/user/{user}.{format}') ->post() @@ -210,7 +210,7 @@ class OC_OCS { }) ->requirements(array('format'=>'xml|json')); - // keygetpublic + // keygetpublic $router->create('keygetpublic', '/cloud/user/{user}/publickey.{format}') ->defaults(array('format' => $format)) @@ -221,7 +221,7 @@ class OC_OCS { }) ->requirements(array('format'=>'xml|json')); - // keygetprivate + // keygetprivate $router->create('keygetpublic', '/cloud/user/{user}/privatekey.{format}') ->defaults(array('format' => $format)) @@ -557,7 +557,7 @@ class OC_OCS { echo(OC_OCS::generatexml($format,'ok',100,'')); } } - + /** * get private data * @param string $user |