aboutsummaryrefslogtreecommitdiff
path: root/_includes
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-24 12:17:48 -0800
committerMark Otto <[email protected]>2013-12-24 12:17:48 -0800
commit5c2dfbf33b133a5e31035df970ffa05585eba422 (patch)
tree522b5814714b2df5064e441959d515a5ea4a89a0 /_includes
parent679c7862374be9b742862923181302f76b3a8c06 (diff)
parent25390716ea2a0bf9cd476858c826775d68c2f1cf (diff)
downloadbootstrap-5c2dfbf33b133a5e31035df970ffa05585eba422.tar.xz
bootstrap-5c2dfbf33b133a5e31035df970ffa05585eba422.zip
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts: docs-assets/js/raw-files.js
Diffstat (limited to '_includes')
-rw-r--r--_includes/header.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/_includes/header.html b/_includes/header.html
index 6da8cef43..1275979f7 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -24,7 +24,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]-->
<!-- Favicons -->