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
commit 86c3f9b8fe
1 changed files with 82 additions and 88 deletions

View File

@ -373,9 +373,6 @@ class OC_OCS {
}
}
/**
* return the config data of this server
* @param string $format
@ -393,7 +390,6 @@ class OC_OCS {
echo(OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'config', '', 1));
}
/**
* check if the provided login/apikey/password is valid
* @param string $format
@ -414,8 +410,6 @@ class OC_OCS {
}
}
// ACTIVITY API #############################################
/**