diff options
| author | Mark Otto <[email protected]> | 2014-01-01 12:27:09 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-01 12:27:09 -0800 |
| commit | 70459c1454d2d4d1df87e59c9dfa359c92b310bb (patch) | |
| tree | b6fe6447981e749eeb4721d027ae44f6dcc029ca /docs/examples/offcanvas | |
| parent | bab240252ad43f32b4efb04b2a2fde98044c2818 (diff) | |
| parent | c583b7965550e60dd51cb11b50628420291463fe (diff) | |
| download | bootstrap-70459c1454d2d4d1df87e59c9dfa359c92b310bb.tar.xz bootstrap-70459c1454d2d4d1df87e59c9dfa359c92b310bb.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs/_includes/footer.html
docs/assets/css/docs.css
Diffstat (limited to 'docs/examples/offcanvas')
| -rw-r--r-- | docs/examples/offcanvas/index.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/examples/offcanvas/index.html b/docs/examples/offcanvas/index.html index f1a447485..3344be910 100644 --- a/docs/examples/offcanvas/index.html +++ b/docs/examples/offcanvas/index.html @@ -6,7 +6,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="description" content=""> <meta name="author" content=""> - <link rel="shortcut icon" href="../../docs-assets/ico/favicon.ico"> + <link rel="shortcut icon" href="../../assets/ico/favicon.ico"> <title>Off Canvas Template for Bootstrap</title> @@ -17,7 +17,7 @@ <link href="offcanvas.css" rel="stylesheet"> <!-- Just for debugging purposes. Don't actually copy this line! --> - <!--[if lt IE 9]><script src="../../docs-assets/js/ie8-responsive-file-warning.js"></script><![endif]--> + <!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]--> <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> |