Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <otto@github.com>2012-12-05 23:05:10 +0400
committerMark Otto <otto@github.com>2012-12-05 23:05:10 +0400
commit33e14fe5bfd7a7091ab491a961d66a2a2580f1de (patch)
tree79c2c539e578877c3241e90402e47c4691c22a39 /docs/customize.html
parentb3019d7aab877cccf03fda3e6894c0fdaa7330f3 (diff)
parented74992853054c57f33ef5d21941f0869e287552 (diff)
Merge branch '2.2.2-wip' into 3.0.0-wip
Conflicts: README.md docs/assets/css/bootstrap.css docs/assets/js/bootstrap.js docs/assets/js/bootstrap.min.js docs/examples/fluid.html docs/scaffolding.html less/breadcrumbs.less less/popovers.less less/responsive.less
Diffstat (limited to 'docs/customize.html')
-rw-r--r--docs/customize.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/customize.html b/docs/customize.html
index 461ed8a522..5177819694 100644
--- a/docs/customize.html
+++ b/docs/customize.html
@@ -18,11 +18,11 @@
<![endif]-->
<!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="assets/ico/favicon.png">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png">
+ <link rel="shortcut icon" href="assets/ico/favicon.png">
</head>