diff options
| author | Mark Otto <[email protected]> | 2012-01-31 14:30:07 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-31 14:30:07 -0800 |
| commit | c84b5cf5f52ad9be72adf9de2956baad1d6e025b (patch) | |
| tree | 60c9078f26909fb48ad714d227f2bd0014060543 /docs/javascript.html | |
| parent | 6cf79a5b8e13e8c1e2919da9e334cc6c9275ab9b (diff) | |
| parent | 80a752f52508ed8c2405da233c667210ed1d5379 (diff) | |
| download | bootstrap-c84b5cf5f52ad9be72adf9de2956baad1d6e025b.tar.xz bootstrap-c84b5cf5f52ad9be72adf9de2956baad1d6e025b.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index f45e67d9e..fb61f170a 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1444,20 +1444,20 @@ $('.myCarousel').carousel({ ================================================== --> <!-- 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="../js/tests/vendor/jquery.js"></script> + <script src="assets/js/jquery.js"></script> <script src="assets/js/google-code-prettify/prettify.js"></script> - <script src="../js/bootstrap-transition.js"></script> - <script src="../js/bootstrap-alert.js"></script> - <script src="../js/bootstrap-modal.js"></script> - <script src="../js/bootstrap-dropdown.js"></script> - <script src="../js/bootstrap-scrollspy.js"></script> - <script src="../js/bootstrap-tab.js"></script> - <script src="../js/bootstrap-tooltip.js"></script> - <script src="../js/bootstrap-popover.js"></script> - <script src="../js/bootstrap-button.js"></script> - <script src="../js/bootstrap-collapse.js"></script> - <script src="../js/bootstrap-carousel.js"></script> - <script src="../js/bootstrap-typeahead.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> + <script src="assets/js/bootstrap-dropdown.js"></script> + <script src="assets/js/bootstrap-scrollspy.js"></script> + <script src="assets/js/bootstrap-tab.js"></script> + <script src="assets/js/bootstrap-tooltip.js"></script> + <script src="assets/js/bootstrap-popover.js"></script> + <script src="assets/js/bootstrap-button.js"></script> + <script src="assets/js/bootstrap-collapse.js"></script> + <script src="assets/js/bootstrap-carousel.js"></script> + <script src="assets/js/bootstrap-typeahead.js"></script> <script src="assets/js/application.js"></script> </body> </html> |