aboutsummaryrefslogtreecommitdiff
path: root/examples/theme/index.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-10-13 18:32:34 -0700
committerMark Otto <[email protected]>2013-10-13 18:32:34 -0700
commit265fda7903e189ee0d2d7201cc92bf384fc53043 (patch)
treecf2249e0696d6ea2923678f9f7b155e265756f03 /examples/theme/index.html
parenta46003b8c7cc20bf4f72b7638a74643353ae047f (diff)
parent727a91de1cdf5cbc4f25528e073480332a5940c5 (diff)
downloadbootstrap-265fda7903e189ee0d2d7201cc92bf384fc53043.tar.xz
bootstrap-265fda7903e189ee0d2d7201cc92bf384fc53043.zip
Merge branch 'master' into restore_grid_mixins
Conflicts: dist/css/bootstrap.min.css
Diffstat (limited to 'examples/theme/index.html')
-rw-r--r--examples/theme/index.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/theme/index.html b/examples/theme/index.html
index 0ca5a2fc4..7cd41b692 100644
--- a/examples/theme/index.html
+++ b/examples/theme/index.html
@@ -20,7 +20,7 @@
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
- <script src="../../docs-assets/js/html5shiv.js"></script>
+ <script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
<script src="../../docs-assets/js/respond.min.js"></script>
<![endif]-->
</head>
@@ -347,7 +347,7 @@
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
- <script src="../../docs-assets/js/jquery.js"></script>
+ <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script>
<script src="../../docs-assets/js/holder.js"></script>
</body>