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

This commit is contained in:
Mark Otto
2011-12-19 22:59:20 -08:00
3 changed files with 52 additions and 1 deletions

View File

@@ -39,7 +39,7 @@
<script src="assets/js/google-code-prettify/prettify.js"></script>
<script>$(function () { prettyPrint() })</script>
<script src="../js/bootstrap-transitions.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>