From: Jacob Thornton Date: Sun, 11 Sep 2011 05:17:37 +0000 (-0700) Subject: Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip X-Git-Tag: v1.3.0~47^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c40e0de3c1d837b2754f7717ebdc4a29c5f92cd8;p=thirdparty%2Fbootstrap.git Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip Conflicts: docs/index.html --- c40e0de3c1d837b2754f7717ebdc4a29c5f92cd8 diff --cc docs/index.html index f914b31b24,5fe2229458..6f8ad30a2d --- a/docs/index.html +++ b/docs/index.html @@@ -1543,6 -1544,6 +1544,10 @@@ Lorem ipsum dolar sit amet illo error < bootstrap-dropdown.js This plugin is for adding dropdown interaction to the bootstrap topbar or tabbed navigations. ++ ++ bootstrap-scrollspy.js ++ The ScrollSpy plugin is for adding an auto updating nav based on scroll position to the bootstrap topbar. ++ bootstrap-tabs.js This plugin adds quick, dynamic tab and pill functionality for cycling through local content. @@@ -1709,19 -1724,19 +1728,19 @@@ + + -