From: Jacob Thornton <jacobthornton@gmail.com>
Date: Tue, 24 Jan 2012 22:33:52 +0000 (-0800)
Subject: Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
X-Git-Tag: v2.0.0~6^2~227^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f209ed810b17fa88ad9683d1888f14965b19f9e;p=thirdparty%2Fbootstrap.git

Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
	docs/templates/pages/index.mustache
---

5f209ed810b17fa88ad9683d1888f14965b19f9e
diff --cc docs/templates/pages/index.mustache
index 8cf9261236,7616de4f11..030a693a8a
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@@ -14,13 -14,13 +14,13 @@@
              <div class="benefits">
                <h4>{{_i}}Feature highlights{{/i}}</h4>
                <ul>
-                 <li><span>&times;</span> {{_i}}Built on LESS{{/i}}</li>
-                 <li><span>&times;</span> {{_i}}Complete styleguide docs{{/i}}</li>
-                 <li><span>&times;</span> {{_i}}Fully responsive design{{/i}}</li>
-                 <li><span>&times;</span> {{_i}}Small footprint (7kb gzipped){{/i}}</li>
-                 <li><span>&times;</span> {{_i}}Support for IE7 and up{{/i}}</li>
-                 <li><span>&times;</span> {{_i}}Custom jQuery plugins{{/i}}</li>
-                 <li><span>&times;</span> {{_i}}Dozens of components{{/i}}</li>
 -                <li>{{_i}}<span>&#10004;</span> Built on LESS{{/i}}</li>
 -                <li>{{_i}}<span>&#10004;</span> Complete style guide docs{{/i}}</li>
 -                <li>{{_i}}<span>&#10004;</span> Fully responsive design{{/i}}</li>
 -                <li>{{_i}}<span>&#10004;</span> Small footprint (10kb gzipped){{/i}}</li>
 -                <li>{{_i}}<span>&#10004;</span> Support for IE7 and up{{/i}}</li>
 -                <li>{{_i}}<span>&#10004;</span> Custom jQuery plugins{{/i}}</li>
 -                <li>{{_i}}<span>&#10004;</span> Dozens of components{{/i}}</li>
++                <li><span>&#10004;</span> {{_i}}Built on LESS{{/i}}</li>
++                <li><span>&#10004;</span> {{_i}}Complete styleguide docs{{/i}}</li>
++                <li><span>&#10004;</span> {{_i}}Fully responsive design{{/i}}</li>
++                <li><span>&#10004;</span> {{_i}}Small footprint (7kb gzipped){{/i}}</li>
++                <li><span>&#10004;</span> {{_i}}Support for IE7 and up{{/i}}</li>
++                <li><span>&#10004;</span> {{_i}}Custom jQuery plugins{{/i}}</li>
++                <li><span>&#10004;</span> {{_i}}Dozens of components{{/i}}</li>
                </ul>
              </div>
            </div>