diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-12-03 18:02:22 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-12-03 18:02:22 +0100 |
| commit | be30b1a8de2c7858be3f1dfa792504478af70eb4 (patch) | |
| tree | eb3f69b006041c1a586479bb59dbf557df48eec0 /lib/image.php | |
| parent | 18663100d9f68400fba1fc344874aacb62bb4659 (diff) | |
| parent | 4cb760a92402ab3eb8550fb05b05eae800030680 (diff) | |
| download | nextcloud-server-be30b1a8de2c7858be3f1dfa792504478af70eb4.tar.gz nextcloud-server-be30b1a8de2c7858be3f1dfa792504478af70eb4.zip | |
merge master into filesystem
Diffstat (limited to 'lib/image.php')
| -rw-r--r-- | lib/image.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/image.php b/lib/image.php index b66c19c2868..26ea43ed29c 100644 --- a/lib/image.php +++ b/lib/image.php @@ -753,7 +753,7 @@ class OC_Image { * @param $x Horizontal position * @param $y Vertical position * @param $w Width - * @param $h Hight + * @param $h Height * @returns bool for success or failure */ public function crop($x, $y, $w, $h) { |