diff options
| author | Jacob Thornton <[email protected]> | 2011-12-22 19:15:09 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-12-22 19:15:09 -0800 |
| commit | 35fdbad24b908714ff1a1221945598527a641863 (patch) | |
| tree | 0a054ac3f3b913fb16f71731b4b04472311afc4a /docs/less.html | |
| parent | 87ac818253a26bcf09fa55f78ae3f55759c54e64 (diff) | |
| parent | 9fb380151d477f1741b7609ade7a9e7fd5450b2c (diff) | |
| download | bootstrap-35fdbad24b908714ff1a1221945598527a641863.tar.xz bootstrap-35fdbad24b908714ff1a1221945598527a641863.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
docs/assets/js/application.js
docs/base-css.html
docs/components.html
docs/index.html
docs/javascript.html
docs/less.html
docs/scaffolding.html
docs/upgrading.html
Diffstat (limited to 'docs/less.html')
| -rw-r--r-- | docs/less.html | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docs/less.html b/docs/less.html index 13dfee282..7d3efd296 100644 --- a/docs/less.html +++ b/docs/less.html @@ -466,8 +466,7 @@ <!-- Le javascript --> <!-- Placed at the end of the document so the pages load faster --> - <!-- <script src="http://code.jquery.com/jquery-1.7.min.js"></script> --> - <script src="../js/tests/vendor/jquery.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 src="assets/js/application.js"></script> </body> |