From: Mark Otto <markdotto@gmail.com>
Date: Sun, 26 Nov 2017 02:32:45 +0000 (-0800)
Subject: Merge branch 'master' into v3.4.0-dev
X-Git-Tag: v3.4.0~48^2~11^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3073a4e9b6649358ed15aa4618337c0c4812495a;p=thirdparty%2Fbootstrap.git

Merge branch 'master' into v3.4.0-dev
---

3073a4e9b6649358ed15aa4618337c0c4812495a
diff --cc _config.yml
index c62ac5c763,b647b349cd..2b60da81b4
--- a/_config.yml
+++ b/_config.yml
@@@ -9,16 -9,17 +9,18 @@@ permalink:        prett
  source:           docs
  destination:      _gh_pages
  host:             0.0.0.0
 -port:             9001
 +port:             3001
+ baseurl:          ""
  url:              http://getbootstrap.com
 +baseurl:          /docs/3.4
  encoding:         UTF-8
  
  gems:
    - jekyll-sitemap
  
  # Custom vars
 -current_version:  3.3.7
 -docs_version:     3.3
 +current_version:  3.4.0
++docs_version:     3.4
  repo:             https://github.com/twbs/bootstrap
  sass_repo:        https://github.com/twbs/bootstrap-sass