From: Mark Otto <markdotto@gmail.com>
Date: Fri, 6 Jan 2012 05:43:54 +0000 (-0800)
Subject: Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
X-Git-Tag: v2.0.0~6^2~364
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bedfa447c52ae45c1a144fba27160811dfb40a2;p=thirdparty%2Fbootstrap.git

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
---

9bedfa447c52ae45c1a144fba27160811dfb40a2
diff --cc docs/assets/js/application.js
index 5fe8b53ef4,6194b88db5..c31fc97a06
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@@ -9,21 -9,12 +9,12 @@@ $(function()
    // ==============================================
  
    // Set a timeout...
 -  setTimeout(function(){
 -    // Hide the address bar!
 -    window.scrollTo(0, 1);
 -  }, 0);
 +  // setTimeout(function(){
 +  //   // Hide the address bar!
 +  //   window.scrollTo(0, 1);
 +  // }, 0);
  
  
-   // Docs topbar nav
-   // ===============
- 
-   $('.nav .active').on('click', function (e) {
-     e.preventDefault()
-     $(this).siblings().toggle()
-   });
- 
- 
    // table sort example
    // ==================