diff options
| author | Mark Otto <[email protected]> | 2011-12-26 16:47:10 -0600 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-12-26 16:47:10 -0600 |
| commit | 544120264d33945c1537b6621b29c71be3405d07 (patch) | |
| tree | 53513d3d5abf3eaa0bebfe228eb2e5e04b2855dc /docs/upgrading.html | |
| parent | 690d3f4d1aeb97a76d22a4dfe056e33606e0bd94 (diff) | |
| parent | 12868933b9141ff9c63277efe36665cc7a8815df (diff) | |
| download | bootstrap-544120264d33945c1537b6621b29c71be3405d07.tar.xz bootstrap-544120264d33945c1537b6621b29c71be3405d07.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
Diffstat (limited to 'docs/upgrading.html')
| -rw-r--r-- | docs/upgrading.html | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/docs/upgrading.html b/docs/upgrading.html index 3e5a14a8a..7be1fd708 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -99,6 +99,7 @@ <li>Added button bar options</li> </ul> </li> +</ul> <!-- <li> <ul> @@ -119,16 +120,5 @@ </footer> </div><!-- /container --> - <!-- 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="http://autobahn.tablesorter.com/jquery.tablesorter.min.js"></script> - <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-dropdown.js"></script> - <script src="../js/bootstrap-twipsy.js"></script> - <script src="../js/bootstrap-scrollspy.js"></script> - <script src="assets/js/application.js"></script> </body> </html> |