aboutsummaryrefslogtreecommitdiff
path: root/docs/_includes/getting-started
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-12-14 16:28:53 -0800
committerMark Otto <[email protected]>2014-12-14 16:28:53 -0800
commitb7be72c86c9b8b0289438f5e97a2263ecdb1344c (patch)
tree2e9ab123c36c652175ca287a7f53b442224d7a20 /docs/_includes/getting-started
parentc187f77e65d177c3a0e662b99d5bff63ee47b3db (diff)
parentc8855a7ad120b37fd9a25125f90093478656362f (diff)
downloadbootstrap-b7be72c86c9b8b0289438f5e97a2263ecdb1344c.tar.xz
bootstrap-b7be72c86c9b8b0289438f5e97a2263ecdb1344c.zip
Merge pull request #15348 from bastienmoulia/master
Correction in the documentation, add the brand-primary true color in comment and woff2 glyphicons
Diffstat (limited to 'docs/_includes/getting-started')
-rw-r--r--docs/_includes/getting-started/whats-included.html3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/_includes/getting-started/whats-included.html b/docs/_includes/getting-started/whats-included.html
index 42e2ea482..8aa8cf2a9 100644
--- a/docs/_includes/getting-started/whats-included.html
+++ b/docs/_includes/getting-started/whats-included.html
@@ -28,7 +28,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
{% endhighlight %}
<!-- NOTE: This info is intentionally duplicated in the README.
Copy any changes made here over to the README too. -->