diff options
| author | Mark Otto <[email protected]> | 2014-01-11 19:13:10 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-11 19:13:10 -0800 |
| commit | bacfd65cb2f9de9e9b4b3fcc83a3aef73befcb80 (patch) | |
| tree | dbeab5560ca6760fa65e9f342c517dcbe56475f9 /dist/js/bootstrap.js | |
| parent | ea20f44815b535975d1f1416fee15bd1ea7acdb3 (diff) | |
| parent | 80c9c14ab956459f07a7f1de8693a2ab693bcb51 (diff) | |
| download | bootstrap-bacfd65cb2f9de9e9b4b3fcc83a3aef73befcb80.tar.xz bootstrap-bacfd65cb2f9de9e9b4b3fcc83a3aef73befcb80.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs/getting-started.html
Diffstat (limited to 'dist/js/bootstrap.js')
| -rw-r--r-- | dist/js/bootstrap.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 88e9645ff..9896669bc 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -4,7 +4,7 @@ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") } +if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery') } /* ======================================================================== * Bootstrap: transition.js v3.0.3 |