diff options
| author | Mark Otto <[email protected]> | 2014-05-22 18:54:25 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-05-22 18:54:25 -0700 |
| commit | 326f6b2b873e7bd888204f754ebe394bbb124c56 (patch) | |
| tree | efb528f8b9b1459e8a3d57a61cefcd9942cd8273 /docs/_includes | |
| parent | 12b5d46f17a125021c5083fbc88b53a7fb86a096 (diff) | |
| parent | fab9ab8fe9b51ebc88872482556df3f793e5ac4a (diff) | |
| download | bootstrap-326f6b2b873e7bd888204f754ebe394bbb124c56.tar.xz bootstrap-326f6b2b873e7bd888204f754ebe394bbb124c56.zip | |
Merge branch 'master' into docs-theme-toggler
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/css/docs.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/header.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/_includes/header.html b/docs/_includes/header.html index a498f56a2..b21969451 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -35,7 +35,7 @@ <!-- Favicons --> <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png"> -<link rel="icon" href="../assets/ico/favicon.ico"> +<link rel="shortcut icon" href="../assets/ico/favicon.ico"> <script> (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |