summaryrefslogtreecommitdiffstats
path: root/lib/image.php
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/image.php
parent7debfac0dc8f602168d8db480cfd4757b4d612b0 (diff)
parent1d57a2e2a9d5e392bb1061479543cd1dec860c4b (diff)
downloadnextcloud-server-5445b94416f50bb040e7426cadfa458607893f07.tar.gz
nextcloud-server-5445b94416f50bb040e7426cadfa458607893f07.zip
merge master into filesystem
Diffstat (limited to 'lib/image.php')
-rw-r--r--lib/image.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/image.php b/lib/image.php
index 26ea43ed29c..eaa35350bcb 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -646,7 +646,7 @@ class OC_Image {
fclose($fh);
return $im;
}
-
+
/**
* @brief Resizes the image preserving ratio.
* @param $maxsize The maximum size of either the width or height.