Skip to content

Commit d6a95b7

Browse files
committed
Merge branch 'master' of https://github.com/twbs/bootstrap
2 parents 4945e37 + 35bced0 commit d6a95b7

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ bootstrap/
5151
├── glyphicons-halflings-regular.eot
5252
├── glyphicons-halflings-regular.svg
5353
├── glyphicons-halflings-regular.ttf
54-
└── glyphicons-halflings-regular.woff
54+
├── glyphicons-halflings-regular.woff
55+
└── glyphicons-halflings-regular.woff2
5556
```
5657

5758
We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). CSS [source maps](https://developers.google.com/chrome-developer-tools/docs/css-preprocessors) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. Fonts from Glyphicons are included, as is the optional Bootstrap theme.

dist/css/bootstrap.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)