From: Mark Otto <markdotto@gmail.com>
Date: Tue, 27 Dec 2011 22:25:22 +0000 (-0600)
Subject: fix tables for rowspan
X-Git-Tag: v2.0.0~6^2~379
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e78d5f8ff33009e4c4ab57496913b43ff1e369dc;p=thirdparty%2Fbootstrap.git

fix tables for rowspan
---

diff --git a/bootstrap.css b/bootstrap.css
index a1fcc1df62..2b870bfce4 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Tue Dec 27 16:07:55 CST 2011
+ * Date: Tue Dec 27 16:25:12 CST 2011
  */
 html, body {
   margin: 0;
diff --git a/docs/base-css.html b/docs/base-css.html
index 99fb9bd1a6..13cbeedbc2 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -646,25 +646,24 @@
       <tr>
         <td>1</td>
         <td colspan="2">Some One</td>
-        <td>English</td>
+        <td>HTML</td>
       </tr>
       <tr>
         <td>2</td>
         <td>Joe</td>
         <td>Sixpack</td>
-        <td>English</td>
+        <td rowspan="2">Javascript</td>
       </tr>
       </tr>
         <td>3</td>
         <td>Joe</td>
         <td>Sixpack</td>
-        <td>English</td>
       </tr>
       <tr>
         <td>3</td>
         <td>Stu</td>
         <td>Dent</td>
-        <td>Code</td>
+        <td>CSS</td>
       </tr>
     </tbody>
   </table>