diff options
| author | Mark Otto <[email protected]> | 2012-12-05 11:05:10 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-12-05 11:05:10 -0800 |
| commit | 33e14fe5bfd7a7091ab491a961d66a2a2580f1de (patch) | |
| tree | 79c2c539e578877c3241e90402e47c4691c22a39 /less/tests/forms-responsive.html | |
| parent | b3019d7aab877cccf03fda3e6894c0fdaa7330f3 (diff) | |
| parent | ed74992853054c57f33ef5d21941f0869e287552 (diff) | |
| download | bootstrap-33e14fe5bfd7a7091ab491a961d66a2a2580f1de.tar.xz bootstrap-33e14fe5bfd7a7091ab491a961d66a2a2580f1de.zip | |
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 'less/tests/forms-responsive.html')
| -rw-r--r-- | less/tests/forms-responsive.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/less/tests/forms-responsive.html b/less/tests/forms-responsive.html index 7a8f8925f..ee9c6822e 100644 --- a/less/tests/forms-responsive.html +++ b/less/tests/forms-responsive.html @@ -23,11 +23,11 @@ <![endif]--> <!-- Le fav and touch icons --> - <link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico"> <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png"> - <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png"> - <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png"> + <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png"> + <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png"> + <link rel="shortcut icon" href="../../docs/assets/ico/favicon.png"> </head> <body> |