diff options
| author | Mark Otto <[email protected]> | 2014-05-22 23:01:42 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-05-22 23:01:42 -0700 |
| commit | d66b65ddde1b2f1a5cb14f601d30c552c79d7626 (patch) | |
| tree | d7f07c493e959cebd256939bf28bcbf4af468a28 /docs/examples/carousel | |
| parent | 91d51d3fba1cc2f80138bb2858ce67c28c9c8a89 (diff) | |
| parent | 10e9fef85c6afde2b3804df928d9351b0f110a6c (diff) | |
| download | bootstrap-d66b65ddde1b2f1a5cb14f601d30c552c79d7626.tar.xz bootstrap-d66b65ddde1b2f1a5cb14f601d30c552c79d7626.zip | |
Merge branch 'master' into icon_paths
Conflicts:
dist/css/bootstrap.css.map
docs/dist/css/bootstrap.css.map
Diffstat (limited to 'docs/examples/carousel')
| -rw-r--r-- | docs/examples/carousel/index.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html index 43c2a652f..b1bc35f4e 100644 --- a/docs/examples/carousel/index.html +++ b/docs/examples/carousel/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>Carousel Template for Bootstrap</title> |