aboutsummaryrefslogtreecommitdiff
path: root/js/button.js
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-01-19 09:03:09 -0800
committerMark Otto <[email protected]>2015-01-19 09:03:09 -0800
commitbcf7dd38b5ab180256e2e4fb5da0369551b3f082 (patch)
treeea515d40d74f6a9414c1dbdcee97b90c615e1d15 /js/button.js
parentce29def7a63c86f238d725ef5b7a284c054d28a6 (diff)
parentfa47de717eb32f044d012974aa72a0c0ad0441e1 (diff)
downloadbootstrap-3.3.2.tar.xz
bootstrap-3.3.2.zip
Merge pull request #15604 from twbs/ship_v3.3.2v3.3.2
Ship v3.3.2
Diffstat (limited to 'js/button.js')
-rw-r--r--js/button.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/button.js b/js/button.js
index 2d71f350b..4d5690173 100644
--- a/js/button.js
+++ b/js/button.js
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: button.js v3.3.1
+ * Bootstrap: button.js v3.3.2
* http://getbootstrap.com/javascript/#buttons
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@@ -19,7 +19,7 @@
this.isLoading = false
}
- Button.VERSION = '3.3.1'
+ Button.VERSION = '3.3.2'
Button.DEFAULTS = {
loadingText: 'loading...'