diff options
| author | Mark Otto <otto@github.com> | 2013-07-18 07:44:27 +0400 |
|---|---|---|
| committer | Mark Otto <otto@github.com> | 2013-07-18 07:44:27 +0400 |
| commit | f0d071832284d968f2cb72b0bb576f8112a349de (patch) | |
| tree | 9766c8da2b7c6890cdc794a2d93d4ca81c191047 /docs/index.html | |
| parent | c5fb401a626c3e0d99a764cb7961e1bd3e619e8f (diff) | |
| parent | bfebf0e490c795601220f74b7089adb4f47acda7 (diff) | |
Merge branch '3.0.0-wip' into bs3_remove_examples
Conflicts:
docs/_includes/nav-getting-started.html
docs/examples/navbar-fixed-top.html
docs/examples/navbar-static-top.html
docs/examples/navbar.html
docs/getting-started.html
Diffstat (limited to 'docs/index.html')
| -rw-r--r-- | docs/index.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/index.html b/docs/index.html index fc8e85322a..49bdcb38e8 100644 --- a/docs/index.html +++ b/docs/index.html @@ -16,15 +16,15 @@ title: Bootstrap <ul class="bs-masthead-links"> <li> - <a href="./customize/" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Customize']);">Customize</a> - </li> - <li> <a href="http://github.com/twitter/bootstrap" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a> </li> <li> <a href="http://examples.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a> </li> <li> + <a href="http://glyphicons.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Glyphicons']);">Glyphicons</a> + </li> + <li> <a href="http://expo.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Bootstrap Expo</a> </li> <li>Version 3.0.0</li> |