]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' into fix-8869
authorMark Otto <otto@github.com>
Mon, 10 Mar 2014 05:01:38 +0000 (22:01 -0700)
committerMark Otto <otto@github.com>
Mon, 10 Mar 2014 05:01:38 +0000 (22:01 -0700)
1  2 
dist/css/bootstrap.css
docs/assets/css/src/docs.css
docs/css.html
less/mixins.less

Simple merge
Simple merge
diff --cc docs/css.html
Simple merge
index 397da934abdbc9ba401ef520503d32268c2e763c,b608a1a8cfb88e4fedf24b2b263eb7b138c72454..2682b67f8b07cb386c7656c39fd97e520491880a
  }
  
  // Responsive utilities
- // -------------------------
+ //
  // More easily include all the states for responsive-utilities.less.
 +// Note: Deprecated .responsive-visibility() as of v3.2.0
  .responsive-visibility() {
    display: block !important;
    table&  { display: table; }