aboutsummaryrefslogtreecommitdiff
path: root/_includes
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-18 10:28:32 -0700
committerMark Otto <[email protected]>2013-08-18 10:28:32 -0700
commitf8b65b41ab0c1bc130c3ca521fb99214f5509568 (patch)
tree0b117fe251e09d6917c5e777c4735574da127617 /_includes
parent6b24297c5beca5adc118d0524c50700928687c1c (diff)
parent6496ffb7d4fc042983882af8dadce39b1d7affac (diff)
downloadbootstrap-f8b65b41ab0c1bc130c3ca521fb99214f5509568.tar.xz
bootstrap-f8b65b41ab0c1bc130c3ca521fb99214f5509568.zip
Merge branch '3.0.0-wip' into bs3_restore_glyphicons
Conflicts: dist/css/bootstrap.min.css
Diffstat (limited to '_includes')
-rw-r--r--_includes/nav-getting-started.html3
1 files changed, 3 insertions, 0 deletions
diff --git a/_includes/nav-getting-started.html b/_includes/nav-getting-started.html
index 1cba756c3..16cafe9d0 100644
--- a/_includes/nav-getting-started.html
+++ b/_includes/nav-getting-started.html
@@ -19,6 +19,9 @@
<a href="#disable-responsive">Disabling responsiveness</a>
</li>
<li>
+ <a href="#migration">Migration</a>
+</li>
+<li>
<a href="#browsers">Browser support</a>
</li>
<li>