diff options
| author | Jacob Thornton <[email protected]> | 2012-01-31 13:59:40 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-31 13:59:40 -0800 |
| commit | fd700e358da02434343c58e7f86eb2e8a8ba2411 (patch) | |
| tree | 831e00c3f661af6bf3bb977ab31a8225d969e822 /docs/examples.html | |
| parent | b9de88890e3db18b48ef10cd5a718002cb5dc4a0 (diff) | |
| parent | e75bc5eb5ffca534fd3a84d749e8b39824654ebb (diff) | |
| download | bootstrap-fd700e358da02434343c58e7f86eb2e8a8ba2411.tar.xz bootstrap-fd700e358da02434343c58e7f86eb2e8a8ba2411.zip | |
Merge branch '2.0-wip'
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/examples.html')
| -rw-r--r-- | docs/examples.html | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/docs/examples.html b/docs/examples.html index 83188c77f..4bdeec055 100644 --- a/docs/examples.html +++ b/docs/examples.html @@ -149,20 +149,20 @@ ================================================== --> <!-- 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> |