diff options
| author | Mark Otto <[email protected]> | 2013-11-30 00:55:00 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-30 00:55:00 -0800 |
| commit | 080aa7f5c8557b232005cb947df51968d4629656 (patch) | |
| tree | e546cc3ec229d201751e426da36a1b2a586ee428 /js/tooltip.js | |
| parent | 441f9d67179f766377eed4b0cedc5dc6eec290e4 (diff) | |
| parent | 819e920d1646f7e9fec8d3dd6ba10dcbd2fa1599 (diff) | |
| download | bootstrap-080aa7f5c8557b232005cb947df51968d4629656.tar.xz bootstrap-080aa7f5c8557b232005cb947df51968d4629656.zip | |
Merge branch 'master' into pr/11299
Conflicts:
dist/css/bootstrap.min.css
docs-assets/js/raw-files.js
Diffstat (limited to 'js/tooltip.js')
| -rw-r--r-- | js/tooltip.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/tooltip.js b/js/tooltip.js index 41375c6c9..9e6177554 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: tooltip.js v3.0.0 + * Bootstrap: tooltip.js v3.0.2 * http://getbootstrap.com/javascript/#tooltip * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== @@ -383,4 +383,4 @@ return this } -}(window.jQuery); +}(jQuery); |