diff options
| author | Mark Otto <[email protected]> | 2013-12-26 21:40:15 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-26 21:40:15 -0800 |
| commit | 5b02dbd97a0a480b0f800cb1011089dab9980300 (patch) | |
| tree | 7eb7ffdc3bf67d303b95ab2ab05bfbf3f76503d1 /_includes/header.html | |
| parent | 12980e7ea47057d7e17c3606604c79c6450b272e (diff) | |
| parent | 201088cb5f9ab4af062b62ac3a10a2e8f07a6ec5 (diff) | |
| download | bootstrap-5b02dbd97a0a480b0f800cb1011089dab9980300.tar.xz bootstrap-5b02dbd97a0a480b0f800cb1011089dab9980300.zip | |
Merge branch 'master' into docs_derp
Conflicts:
_config.yml
Diffstat (limited to '_includes/header.html')
| -rw-r--r-- | _includes/header.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/_includes/header.html b/_includes/header.html index 18d7660b8..1275979f7 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -24,12 +24,12 @@ <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> - <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script> + <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script> <![endif]--> <!-- Favicons --> <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ page.base_url }}docs-assets/ico/apple-touch-icon-144-precomposed.png"> - <link rel="shortcut icon" href="{{ page.base_url }}docs-assets/ico/favicon.png"> + <link rel="shortcut icon" href="{{ page.base_url }}docs-assets/ico/favicon.ico"> <script> var _gaq = _gaq || []; |