Added rowspan and colspan docs.

docs/_i18n/en/documentation/column-options.md

@@ -63,11 +63,25 @@ The column options is defined in `jQuery.fn.bootstrapTable.columnDefaults`.
         <td>The column class name.</td>
     </tr>
     <tr>
+        <td>rowspan</td>
+        <td>rowspan / data-rowspan</td>
+        <td>Number</td>
+        <td>undefined</td>
+        <td>Indicate how many rows a cell should take up.</td>
+    </tr>
+    <tr>
+        <td>colspan</td>
+        <td>colspan / data-colspan</td>
+        <td>Number</td>
+        <td>undefined</td>
+        <td>Indicate how many columns a cell should take up.</td>
+    </tr>
+    <tr>
         <td>align</td>
         <td>data-align</td>
         <td>String</td>
         <td>undefined</td>
-        <td>Indicate how to align the column data. "left', 'right', 'center' can be used.</td>
+        <td>Indicate how to align the column data. 'left', 'right', 'center' can be used.</td>
     </tr>
     <tr>
         <td>halign</td>

docs/_i18n/es/documentation/column-options.md

@@ -63,11 +63,25 @@ Las propiedades de la columna están definidas en `jQuery.fn.bootstrapTable.colu
         <td>La clase CSS de la columna.</td>
     </tr>
     <tr>
+        <td>rowspan</td>
+        <td>rowspan / data-rowspan</td>
+        <td>Number</td>
+        <td>undefined</td>
+        <td>Indicate how many rows a cell should take up.</td>
+    </tr>
+    <tr>
+        <td>colspan</td>
+        <td>colspan / data-colspan</td>
+        <td>Number</td>
+        <td>undefined</td>
+        <td>Indicate how many columns a cell should take up.</td>
+    </tr>
+    <tr>
         <td>align</td>
         <td>data-align</td>
         <td>String</td>
         <td>undefined</td>
-        <td>Indica cómo se alinea la columna. Se puede usar "left', 'right', 'center'.</td>
+        <td>Indica cómo se alinea la columna. Se puede usar 'left', 'right', 'center'.</td>
     </tr>
     <tr>
         <td>halign</td>
@@ -216,4 +230,4 @@ Las propiedades de la columna están definidas en `jQuery.fn.bootstrapTable.colu
         <td>True para incluir la columna en la búsqueda.</td>
     </tr>
     </tbody>
-</table>
+</table>

docs/_i18n/zh-cn/documentation/column-options.md

@@ -63,11 +63,25 @@ The column options is defined in `jQuery.fn.bootstrapTable.columnDefaults`.
         <td>The column class name.</td>
     </tr>
     <tr>
+        <td>rowspan</td>
+        <td>rowspan / data-rowspan</td>
+        <td>Number</td>
+        <td>undefined</td>
+        <td>Indicate how many rows a cell should take up.</td>
+    </tr>
+    <tr>
+        <td>colspan</td>
+        <td>colspan / data-colspan</td>
+        <td>Number</td>
+        <td>undefined</td>
+        <td>Indicate how many columns a cell should take up.</td>
+    </tr>
+    <tr>
         <td>align</td>
         <td>data-align</td>
         <td>String</td>
         <td>undefined</td>
-        <td>Indicate how to align the column data. "left', 'right', 'center' can be used.</td>
+        <td>Indicate how to align the column data. 'left', 'right', 'center' can be used.</td>
     </tr>
     <tr>
         <td>halign</td>