summaryrefslogtreecommitdiffstats
path: root/lib/connector
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2013-01-16 19:04:50 +0100
committerRobin Appelman <icewind@owncloud.com>2013-01-16 19:04:50 +0100
commit5445b94416f50bb040e7426cadfa458607893f07 (patch)
tree337b12362333030e0ebda37acb7f25073723a7af /lib/connector
parent7debfac0dc8f602168d8db480cfd4757b4d612b0 (diff)
parent1d57a2e2a9d5e392bb1061479543cd1dec860c4b (diff)
downloadnextcloud-server-5445b94416f50bb040e7426cadfa458607893f07.tar.gz
nextcloud-server-5445b94416f50bb040e7426cadfa458607893f07.zip
merge master into filesystem
Diffstat (limited to 'lib/connector')
-rw-r--r--lib/connector/sabre/node.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index 93d8fc477d6..b48d3b41f24 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -176,9 +176,9 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
* @brief Returns a list of properties for this nodes.;
* @param array $properties
* @return array
- * @note The properties list is a list of propertynames the client
- * requested, encoded as xmlnamespace#tagName, for example:
- * http://www.example.org/namespace#author If the array is empty, all
+ * @note The properties list is a list of propertynames the client
+ * requested, encoded as xmlnamespace#tagName, for example:
+ * http://www.example.org/namespace#author If the array is empty, all
* properties should be returned
*/
public function getProperties($properties) {