mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Jörn Friedrich Dreyer 2012-09-10 14:14:49 +02:00
parent db7a18455f 5a65c5a46c
commit 86c3f9b8fe
1 changed files with 82 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ocs.php
View File

@ -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 {
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 {
} }
} }
// ACTIVITY API ############################################# // ACTIVITY API #############################################
/** /**