aboutsummaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-12-15 12:44:04 -0800
committerMark Otto <[email protected]>2014-12-15 12:44:04 -0800
commitd6a95b72a039581dea9bb2dc1d669d7d2d29cf66 (patch)
tree1e5ae6ae0f53e83ad9fc1dd1d8f5dfc17285d401 /README.md
parent4945e370f057ef491b0197034ddedd969913b06c (diff)
parent35bced0308de50036d1bf796bd4e5998463fcaef (diff)
downloadbootstrap-d6a95b72a039581dea9bb2dc1d669d7d2d29cf66.tar.xz
bootstrap-d6a95b72a039581dea9bb2dc1d669d7d2d29cf66.zip
Merge branch 'master' of https://github.com/twbs/bootstrap
Diffstat (limited to 'README.md')
-rw-r--r--README.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/README.md b/README.md
index 48d5aa51d..37beecf77 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,8 @@ bootstrap/
├── glyphicons-halflings-regular.eot
├── glyphicons-halflings-regular.svg
├── glyphicons-halflings-regular.ttf
- └── glyphicons-halflings-regular.woff
+ ├── glyphicons-halflings-regular.woff
+ └── glyphicons-halflings-regular.woff2
```
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.