summaryrefslogtreecommitdiffstats
path: root/lib/vobject.php
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2012-11-04 12:31:06 +0100
committerThomas Tanghus <thomas@tanghus.net>2012-11-04 12:31:06 +0100
commite6a7bba0950688d73f52cd622bdf6ec62dff9281 (patch)
treeaec719c0af896e1f47c0475f13ed2355dbf34f4f /lib/vobject.php
parent8e5b6bf21d14b6022e543869cba503bb582b1cb5 (diff)
parent17d466b03b91ccc058fe1a88340df36c22a580c2 (diff)
downloadnextcloud-server-e6a7bba0950688d73f52cd622bdf6ec62dff9281.tar.gz
nextcloud-server-e6a7bba0950688d73f52cd622bdf6ec62dff9281.zip
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts: lib/vcategories.php
Diffstat (limited to 'lib/vobject.php')
-rw-r--r--lib/vobject.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/vobject.php b/lib/vobject.php
index 44a5fbafdb3..267176ebc07 100644
--- a/lib/vobject.php
+++ b/lib/vobject.php
@@ -201,7 +201,7 @@ class OC_VObject{
return $this->vobject->__isset($name);
}
- public function __call($function,$arguments) {
+ public function __call($function, $arguments) {
return call_user_func_array(array($this->vobject, $function), $arguments);
}
}