aboutsummaryrefslogtreecommitdiffstats
path: root/lib/helper.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-11-30 00:18:42 +0100
committerRobin Appelman <icewind@owncloud.com>2012-11-30 00:18:42 +0100
commitd33f697a5f3438f286ba3abe63255b6797a6fc03 (patch)
tree3bde00fb82540d9a44d0cfe97b41a7c6ecc668d3 /lib/helper.php
parenta609992a75d1dad15398f55e22ad2244c78650dc (diff)
parent9b709fa95df5b93b9fb05e33158122003891c154 (diff)
downloadnextcloud-server-d33f697a5f3438f286ba3abe63255b6797a6fc03.tar.gz
nextcloud-server-d33f697a5f3438f286ba3abe63255b6797a6fc03.zip
merge master into filesystem
Diffstat (limited to 'lib/helper.php')
-rw-r--r--lib/helper.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/helper.php b/lib/helper.php
index 536b70b074a..269850e7810 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -758,5 +758,4 @@ class OC_Helper {
}
return $str;
}
-
}