Merge remote-tracking branch 'upstream/develop' into develop

2014-05-28 21:30:14 +07:00 · 2014-05-28 21:30:14 +07:00 · 086ac9d363
commit 086ac9d363
parent 88f6518406 eb32ff2e15
1 changed files with 1 additions and 1 deletions
--- a/docs/recipes.rst
+++ b/docs/recipes.rst
@ -13,7 +13,7 @@ vertically.
    $imageStyle = array(
        'width' => 40,
-        'height' => 40
+        'height' => 40,
        'wrappingStyle' => 'square',
        'positioning' => 'absolute',
        'posHorizontalRel' => 'margin',