diff options
| author | fat <[email protected]> | 2012-10-29 21:28:17 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2012-10-29 21:28:17 -0700 |
| commit | 31c1eba51bf3f5a988e7bef9da88372e673c30c2 (patch) | |
| tree | f36c63804b743cf55e2f61ba55827e16c4ae8597 /js/bootstrap-button.js | |
| parent | 92e7f166e7b65259cffcf20a27984bc365dd8b48 (diff) | |
| parent | 41ad16fe406956cc8604b295ae0b5f185386c595 (diff) | |
| download | bootstrap-31c1eba51bf3f5a988e7bef9da88372e673c30c2.tar.xz bootstrap-31c1eba51bf3f5a988e7bef9da88372e673c30c2.zip | |
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
Conflicts:
bootstrap/css/bootstrap.css
bootstrap/css/bootstrap.min.css
Diffstat (limited to 'js/bootstrap-button.js')
| -rw-r--r-- | js/bootstrap-button.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js index dbb2c08ed..cc3e92511 100644 --- a/js/bootstrap-button.js +++ b/js/bootstrap-button.js @@ -1,5 +1,5 @@ /* ============================================================ - * bootstrap-button.js v2.1.2 + * bootstrap-button.js v2.2.0 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ * Copyright 2012 Twitter, Inc. |