diff options
| author | Rod Vagg <[email protected]> | 2011-11-06 12:41:55 +1100 |
|---|---|---|
| committer | Rod Vagg <[email protected]> | 2011-11-06 12:41:55 +1100 |
| commit | 3628eb79ae42ca1c398d190ca5e96108f3cd353b (patch) | |
| tree | 76b8a76a77bdfe28171712e73290523618d8dd39 /docs | |
| parent | f6a258ef36c0e9383b35e8f33cda14ba4718e0f3 (diff) | |
| parent | c3c700fd02dc1fbd096bd5926960dd9b80b8169d (diff) | |
| download | bootstrap-3628eb79ae42ca1c398d190ca5e96108f3cd353b.tar.xz bootstrap-3628eb79ae42ca1c398d190ca5e96108f3cd353b.zip | |
Merge branch 'master' into poveropt
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/index.html | 2 | ||||
| -rw-r--r-- | docs/javascript.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/index.html b/docs/index.html index ff79f84f4..f22db0e60 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2024,7 +2024,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita <!-- Le javascript --> - <script src="http://code.jquery.com/jquery-1.5.2.min.js"></script> + <script src="http://code.jquery.com/jquery-1.7.min.js"></script> <script src="http://autobahn.tablesorter.com/jquery.tablesorter.min.js"></script> <script src="assets/js/google-code-prettify/prettify.js"></script> <script>$(function () { prettyPrint() })</script> 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> |