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

ivanlanin · ivanlanin · commit 086ac9d36376 · 2014-05-28T21:30:14.000+07:00
diff --git 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',
