diff options
| author | Mark Otto <[email protected]> | 2014-12-15 12:44:04 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-12-15 12:44:04 -0800 |
| commit | d6a95b72a039581dea9bb2dc1d669d7d2d29cf66 (patch) | |
| tree | 1e5ae6ae0f53e83ad9fc1dd1d8f5dfc17285d401 /dist/css/bootstrap.css | |
| parent | 4945e370f057ef491b0197034ddedd969913b06c (diff) | |
| parent | 35bced0308de50036d1bf796bd4e5998463fcaef (diff) | |
| download | bootstrap-d6a95b72a039581dea9bb2dc1d669d7d2d29cf66.tar.xz bootstrap-d6a95b72a039581dea9bb2dc1d669d7d2d29cf66.zip | |
Merge branch 'master' of https://github.com/twbs/bootstrap
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index f89de14a9..68c22cef6 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -268,7 +268,7 @@ th { font-family: 'Glyphicons Halflings'; src: url('../fonts/glyphicons-halflings-regular.eot'); - src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); + src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); } .glyphicon { position: relative; |