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

Conflicts: docs/assets/css/bootstrap.css
2012-01-27 21:09:24 -08:00 · 2012-01-27 21:09:24 -08:00 · d0447e9aa5
commit d0447e9aa5
parent 3934d1b6c4 15d3a4797f
5 changed files with 8 additions and 15 deletions
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@ -273,4 +273,4 @@
  .offset12  { .offset(12); }

 }
-*/
+*/
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@ -6,7 +6,6 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Fri Jan 27 21:07:37 PST 2012
 */
 article,
 aside,