diff options
| author | fat <[email protected]> | 2013-12-24 12:35:24 -0800 |
|---|---|---|
| committer | fat <[email protected]> | 2013-12-24 12:35:24 -0800 |
| commit | 558b6a478d6dfdc5a8ee579c93d1080b553ac9a0 (patch) | |
| tree | 4739563ddfbd59ed5fc49dd9bdd736cf1fbe93e7 /js/button.js | |
| parent | 50bd4edb8c2f498ac10a07250c57570489c427b0 (diff) | |
| parent | 1da3a8c6b131102f7e04a08f15783ca596634694 (diff) | |
| download | bootstrap-558b6a478d6dfdc5a8ee579c93d1080b553ac9a0.tar.xz bootstrap-558b6a478d6dfdc5a8ee579c93d1080b553ac9a0.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
dist/js/bootstrap.min.js
docs-assets/js/raw-files.js
Diffstat (limited to 'js/button.js')
| -rw-r--r-- | js/button.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/button.js b/js/button.js index 2cf67f6ad..f9cca154a 100644 --- a/js/button.js +++ b/js/button.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: button.js v3.1.0 + * Bootstrap: button.js v3.0.3 * http://getbootstrap.com/javascript/#buttons * ======================================================================== * Copyright 2013 Twitter, Inc. |