From: Mark Otto <otto@github.com>
Date: Mon, 19 Aug 2013 02:02:42 +0000 (-0700)
Subject: Merge branch '3.0.0-wip' into bs3_homepage
X-Git-Tag: v3.0.0~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9dcae610e97c5422652d7212fda5985de1653d4c;p=thirdparty%2Fbootstrap.git

Merge branch '3.0.0-wip' into bs3_homepage

Conflicts:
	customize.html
	examples/justified-nav/justified-nav.css
---

9dcae610e97c5422652d7212fda5985de1653d4c
diff --cc _config.yml
index 6f68eb7521,d3c51969e7..332f252fd7
--- a/_config.yml
+++ b/_config.yml
@@@ -12,12 -12,9 +12,9 @@@ port:             900
  
  # Custom vars
  repo:             https://github.com/twbs/bootstrap
 -download:         https://github.com/twbs/bootstrap/archive/3.0.0-wip.zip
 -download_dist:    http://getbootstrap.com/bs-v3.0.0-rc.2-dist.zip
 +download:         https://github.com/twbs/bootstrap/archive/v3.0.0.zip
 +download_dist:    https://github.com/twbs/bootstrap/releases/download/v3.0.0/bootstrap-3.0.0-dist.zip
  
- glyphicons:       http://glyphicons.getbootstrap.com
- glyphicons_repo:  https://github.com/twbs/bootstrap-glyphicons
- 
  blog:             http://blog.getbootstrap.com
  expo:             http://expo.getbootstrap.com
  
diff --cc examples/justified-nav/justified-nav.css
index 9b8929c35d,20134203c8..7837acf40b
--- a/examples/justified-nav/justified-nav.css
+++ b/examples/justified-nav/justified-nav.css
@@@ -83,8 -76,8 +76,6 @@@ body 
    }
  }
  
--
--
  /* Responsive: Portrait tablets and up */
  @media screen and (min-width: 768px) {
    /* Remove the padding we set earlier */