diff options
| author | Ivan Khalopik <[email protected]> | 2013-05-07 15:16:45 +0300 |
|---|---|---|
| committer | Ivan Khalopik <[email protected]> | 2013-05-07 15:16:45 +0300 |
| commit | 3c7a43a1f373d0c534476578b96a75ae2e63c985 (patch) | |
| tree | f11fa18c33d1a65ae4422dc3c352c34a2b323b8c /js/bootstrap-button.js | |
| parent | 41c782567775d3bbcfc62d163ae22a531277b5e2 (diff) | |
| parent | b352f98f325adbd994f01cb94f4d0a454783bbce (diff) | |
| download | bootstrap-3c7a43a1f373d0c534476578b96a75ae2e63c985.tar.xz bootstrap-3c7a43a1f373d0c534476578b96a75ae2e63c985.zip | |
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
Conflicts:
js/tests/unit/bootstrap-collapse.js
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 6e1aa9c81..a42baf2a8 100644 --- a/js/bootstrap-button.js +++ b/js/bootstrap-button.js @@ -102,4 +102,4 @@ $btn.button('toggle') }) -}(window.jQuery);
\ No newline at end of file +}(window.jQuery); |