diff options
| author | Mark Otto <[email protected]> | 2014-05-20 23:27:40 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-05-20 23:27:40 -0700 |
| commit | 707b362b801d7a430c1911493a65085e81b4ee8d (patch) | |
| tree | b659b23c3884e9100c1e800161e96110a0853294 /js/button.js | |
| parent | bdd822a94cdf2d452e067569e76ca1537dc74d8d (diff) | |
| parent | 3dd1531d81c90d6d1cf04962032f868d315ab21c (diff) | |
| download | bootstrap-707b362b801d7a430c1911493a65085e81b4ee8d.tar.xz bootstrap-707b362b801d7a430c1911493a65085e81b4ee8d.zip | |
Merge branch 'master' into docs-theme-toggler
Conflicts:
docs/assets/css/docs.min.css
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...' } |