mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code Activity

Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Browse Source 
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
This commit is contained in:
Jacob Thornton
2011-12-22 19:15:09 -08:00
parent 87ac818253 9fb380151d
commit 35fdbad24b
17 changed files with 471 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/less.html
+1 -2
View File
@@ -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>