2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-24 14:04:09 +03:00

Merge branch 'master' into restore_grid_mixins

Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-10-13 18:32:34 -07:00
39 changed files with 356 additions and 332 deletions
+1 -1
View File
@@ -21,7 +21,7 @@
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="{{ page.base_url }}docs-assets/js/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
<script src="{{ page.base_url }}docs-assets/js/respond.min.js"></script>
<![endif]-->