2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00

Merge branch 'master' into v3.4.0-dev

This commit is contained in:
Mark Otto
2017-11-25 18:32:45 -08:00
6 changed files with 32 additions and 21 deletions
+2
View File
@@ -10,6 +10,7 @@ source: docs
destination: _gh_pages
host: 0.0.0.0
port: 3001
baseurl: ""
url: http://getbootstrap.com
baseurl: /docs/3.4
encoding: UTF-8
@@ -19,6 +20,7 @@ gems:
# Custom vars
current_version: 3.4.0
docs_version: 3.4
repo: https://github.com/twbs/bootstrap
sass_repo: https://github.com/twbs/bootstrap-sass