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/examples/theme | |
| 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/examples/theme')
| -rw-r--r-- | docs/examples/theme/index.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/examples/theme/index.html b/docs/examples/theme/index.html index b10e7ea14..31ef3bc77 100644 --- a/docs/examples/theme/index.html +++ b/docs/examples/theme/index.html @@ -6,7 +6,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="description" content=""> <meta name="author" content=""> - <link rel="icon" href="../../assets/ico/favicon.ico"> + <link rel="shortcut icon" href="../../assets/ico/favicon.ico"> <title>Theme Template for Bootstrap</title> |