aboutsummaryrefslogtreecommitdiff
path: root/docs/javascript.html
diff options
context:
space:
mode:
authorRod Vagg <[email protected]>2011-11-06 12:41:55 +1100
committerRod Vagg <[email protected]>2011-11-06 12:41:55 +1100
commit3628eb79ae42ca1c398d190ca5e96108f3cd353b (patch)
tree76b8a76a77bdfe28171712e73290523618d8dd39 /docs/javascript.html
parentf6a258ef36c0e9383b35e8f33cda14ba4718e0f3 (diff)
parentc3c700fd02dc1fbd096bd5926960dd9b80b8169d (diff)
downloadbootstrap-3628eb79ae42ca1c398d190ca5e96108f3cd353b.tar.xz
bootstrap-3628eb79ae42ca1c398d190ca5e96108f3cd353b.zip
Merge branch 'master' into poveropt
Diffstat (limited to 'docs/javascript.html')
-rw-r--r--docs/javascript.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/javascript.html b/docs/javascript.html
index 9176ff698..82dcffba7 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -12,7 +12,7 @@
<![endif]-->
<!-- Le javascript -->
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script>
+ <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
<script src="assets/js/google-code-prettify/prettify.js"></script>
<script>$(function () { prettyPrint() })</script>
<script src="../js/bootstrap-modal.js"></script>