From: Mark Otto <otto@github.com>
Date: Sun, 1 Sep 2013 19:55:59 +0000 (+0200)
Subject: Merge branch 'master' of github.com:twbs/bootstrap
X-Git-Tag: v3.0.1~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26727bfefd46059a6ce66be7ed0e54910870efd9;p=thirdparty%2Fbootstrap.git

Merge branch 'master' of github.com:twbs/bootstrap
---

26727bfefd46059a6ce66be7ed0e54910870efd9
diff --cc less/grid.less
index ef6f1ebda9,4cab7e3867..100d51fa22
--- a/less/grid.less
+++ b/less/grid.less
@@@ -269,12 -269,12 +269,12 @@@
  //
  // Columns, offsets, pushes, and pulls for the large desktop device range.
  //
- // Note that `.col-lg-12` doesn't get floated on purpose—there's no need since
+ // Note that `.col-lg-12` doesn't get floated on purpose--there's no need since
  // it's full-width.
  
 -@media (min-width: @screen-lg-desktop) {
 +@media (min-width: @screen-lg-min) {
    .container {
 -    max-width: @container-lg-desktop;
 +    max-width: @container-lg;
    }
  
    .col-lg-1,