diff options
| author | fat <[email protected]> | 2013-12-24 12:35:24 -0800 |
|---|---|---|
| committer | fat <[email protected]> | 2013-12-24 12:35:24 -0800 |
| commit | 558b6a478d6dfdc5a8ee579c93d1080b553ac9a0 (patch) | |
| tree | 4739563ddfbd59ed5fc49dd9bdd736cf1fbe93e7 /examples/carousel | |
| parent | 50bd4edb8c2f498ac10a07250c57570489c427b0 (diff) | |
| parent | 1da3a8c6b131102f7e04a08f15783ca596634694 (diff) | |
| download | bootstrap-558b6a478d6dfdc5a8ee579c93d1080b553ac9a0.tar.xz bootstrap-558b6a478d6dfdc5a8ee579c93d1080b553ac9a0.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
dist/js/bootstrap.min.js
docs-assets/js/raw-files.js
Diffstat (limited to 'examples/carousel')
| -rw-r--r-- | examples/carousel/index.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/carousel/index.html b/examples/carousel/index.html index 27ef81ecb..124674cf3 100644 --- a/examples/carousel/index.html +++ b/examples/carousel/index.html @@ -19,7 +19,7 @@ <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> - <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script> + <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script> <![endif]--> <!-- Custom styles for this template --> |