diff options
| author | Mark Otto <[email protected]> | 2012-11-29 21:35:57 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-29 21:35:57 -0800 |
| commit | 52e669d6192aa5a97c159450e985429be6992d07 (patch) | |
| tree | 608c0372b6f61db96bb74c6b1cd53697e9dda358 /docs/javascript.html | |
| parent | 12aa060efdc0647368109dd77a55861ad5225912 (diff) | |
| parent | 38c546c785d4e96da097253dd135fa7ff9cac69e (diff) | |
| download | bootstrap-52e669d6192aa5a97c159450e985429be6992d07.tar.xz bootstrap-52e669d6192aa5a97c159450e985429be6992d07.zip | |
Merge branch '2.2.2-wip-holder' into 2.2.2-wip
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index f07f28909..9a834b820 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1726,7 +1726,6 @@ $('[data-spy="affix"]').each(function () { <!-- Placed at the end of the document so the pages load faster --> <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script> <script src="assets/js/jquery.js"></script> - <script src="assets/js/google-code-prettify/prettify.js"></script> <script src="assets/js/bootstrap-transition.js"></script> <script src="assets/js/bootstrap-alert.js"></script> <script src="assets/js/bootstrap-modal.js"></script> @@ -1740,6 +1739,10 @@ $('[data-spy="affix"]').each(function () { <script src="assets/js/bootstrap-carousel.js"></script> <script src="assets/js/bootstrap-typeahead.js"></script> <script src="assets/js/bootstrap-affix.js"></script> + + <script src="assets/js/holder/holder.js"></script> + <script src="assets/js/google-code-prettify/prettify.js"></script> + <script src="assets/js/application.js"></script> |