Skip to content
Snippets Groups Projects
Commit 86c3f9b8 authored by Jörn Friedrich Dreyer's avatar Jörn Friedrich Dreyer
Browse files

Merge branch 'master' of github.com:owncloud/core

parents db7a1845 5a65c5a4
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 82 additions and 88 deletions
lib/ocs.php
+ 82
− 88
View file @ 86c3f9b8
...@@ -373,9 +373,6 @@ class OC_OCS { ...@@ -373,9 +373,6 @@ class OC_OCS {
} }
} }
/** /**
* return the config data of this server * return the config data of this server
* @param string $format * @param string $format
...@@ -393,7 +390,6 @@ class OC_OCS { ...@@ -393,7 +390,6 @@ class OC_OCS {
echo(OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'config', '', 1)); echo(OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'config', '', 1));
} }
/** /**
* check if the provided login/apikey/password is valid * check if the provided login/apikey/password is valid
* @param string $format * @param string $format
...@@ -414,8 +410,6 @@ class OC_OCS { ...@@ -414,8 +410,6 @@ class OC_OCS {
} }
} }
// ACTIVITY API ############################################# // ACTIVITY API #############################################
/** /**
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment