diff options
| author | Mark Otto <[email protected]> | 2013-11-06 14:04:54 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-06 14:04:54 -0800 |
| commit | 6df6723c156ab565c7b6341fc58582fceadd7649 (patch) | |
| tree | 4cc372a56ece6b8250b1bcadf433f6e5ea1853ca /js/button.js | |
| parent | b593df183087d88940d7af3e59b401685ada3dfe (diff) | |
| parent | 3887f540b978d593f433bfef15888bc2d103de72 (diff) | |
| download | bootstrap-6df6723c156ab565c7b6341fc58582fceadd7649.tar.xz bootstrap-6df6723c156ab565c7b6341fc58582fceadd7649.zip | |
Merge branch 'master' into docs_derp
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'js/button.js')
| -rw-r--r-- | js/button.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/button.js b/js/button.js index 44c101a2a..0145689dd 100644 --- a/js/button.js +++ b/js/button.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: button.js v3.0.0 + * Bootstrap: button.js v3.0.2 * http://getbootstrap.com/javascript/#buttons * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -106,4 +106,4 @@ e.preventDefault() }) -}(window.jQuery); +}(jQuery); |