diff options
| author | Mark Otto <[email protected]> | 2013-08-18 19:02:42 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 19:02:42 -0700 |
| commit | 9dcae610e97c5422652d7212fda5985de1653d4c (patch) | |
| tree | 03f5f15fb5d3a1561f69ce97a1a9f651e816330c /_includes/nav-getting-started.html | |
| parent | 578a14e14aa7c6ad37f307d5d78e9a2afb0e7bfb (diff) | |
| parent | 5bd2d7ed7e5a2bae56de81bf550f2e4b1451ab25 (diff) | |
| download | bootstrap-9dcae610e97c5422652d7212fda5985de1653d4c.tar.xz bootstrap-9dcae610e97c5422652d7212fda5985de1653d4c.zip | |
Merge branch '3.0.0-wip' into bs3_homepage
Conflicts:
customize.html
examples/justified-nav/justified-nav.css
Diffstat (limited to '_includes/nav-getting-started.html')
| -rw-r--r-- | _includes/nav-getting-started.html | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/_includes/nav-getting-started.html b/_includes/nav-getting-started.html index 1cba756c3..8285af1bb 100644 --- a/_includes/nav-getting-started.html +++ b/_includes/nav-getting-started.html @@ -19,6 +19,15 @@ <a href="#disable-responsive">Disabling responsiveness</a> </li> <li> + <a href="#migration">Migrating from 2.x to 3.0</a> + <ul class="nav"> + <li><a href="#migration-classes">Major class changes</a></li> + <li><a href="#migration-new">What's new</a></li> + <li><a href="#migration-dropped">What's removed</a></li> + <li><a href="#migration-notes">Additional notes</a></li> + </ul> +</li> +<li> <a href="#browsers">Browser support</a> </li> <li> |