diff options
| author | Mark Otto <[email protected]> | 2014-05-20 23:21:12 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-05-20 23:21:12 -0700 |
| commit | 91d51d3fba1cc2f80138bb2858ce67c28c9c8a89 (patch) | |
| tree | 32fd8faabe6fdb8d17aea70fc7ccd56524d92aba /js/button.js | |
| parent | c42cd8164c8698cbc3acfbb99e525bd8f195d819 (diff) | |
| parent | 3dd1531d81c90d6d1cf04962032f868d315ab21c (diff) | |
| download | bootstrap-91d51d3fba1cc2f80138bb2858ce67c28c9c8a89.tar.xz bootstrap-91d51d3fba1cc2f80138bb2858ce67c28c9c8a89.zip | |
Merge branch 'master' into icon_paths
Diffstat (limited to 'js/button.js')
| -rw-r--r-- | js/button.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/button.js b/js/button.js index bbce6690e..aa7145072 100644 --- a/js/button.js +++ b/js/button.js @@ -19,6 +19,8 @@ this.isLoading = false } + Button.VERSION = '3.1.1' + Button.DEFAULTS = { loadingText: 'loading...' } |