From: Mark Otto <markdotto@gmail.com>
Date: Mon, 9 Apr 2018 00:31:07 +0000 (-0700)
Subject: Merge branch 'v3.4.0-dev' of https://github.com/twbs/bootstrap-3 into v3.4.0-dev
X-Git-Tag: v3.4.0~48^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07ee6c8ea171ae883d72d6d240b742537cd20d77;p=thirdparty%2Fbootstrap.git

Merge branch 'v3.4.0-dev' of https://github.com/twbs/bootstrap-3 into v3.4.0-dev
---

07ee6c8ea171ae883d72d6d240b742537cd20d77
diff --cc _config.yml
index 67439a76b5,83e4121daf..d74da67fc2
--- a/_config.yml
+++ b/_config.yml
@@@ -9,8 -9,7 +9,7 @@@ permalink:        prett
  source:           docs
  destination:      _gh_pages
  host:             0.0.0.0
 -port:             3001
 +port:             9001
- baseurl:          ""
  url:              http://getbootstrap.com
  baseurl:          /docs/3.4
  encoding:         UTF-8