From: Mark Otto <markdotto@gmail.com>
Date: Sat, 7 Apr 2018 05:11:55 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/master' into v3.4.0-dev
X-Git-Tag: v3.4.0~48^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1bdfc2b5229a881f15aa4b2f81a81bf57a97c88;p=thirdparty%2Fbootstrap.git

Merge remote-tracking branch 'origin/master' into v3.4.0-dev
---

e1bdfc2b5229a881f15aa4b2f81a81bf57a97c88
diff --cc _config.yml
index eebe695e22,b647b349cd..67439a76b5
--- a/_config.yml
+++ b/_config.yml
@@@ -10,15 -10,16 +10,17 @@@ source:           doc
  destination:      _gh_pages
  host:             0.0.0.0
  port:             9001
+ 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