diff options
| author | Mark Otto <[email protected]> | 2014-01-29 22:18:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-29 22:18:29 -0800 |
| commit | d2f1887bb5e7b651b11d6dd22ce191c733717a83 (patch) | |
| tree | 18aec6ab68ae29013e85a4a184baf33afa346769 /docs/_includes/header.html | |
| parent | e38fd138ce04d73e03100a3ea42496fc914120e9 (diff) | |
| parent | 9195d8e8eb51208e4272e4c7e0851e2695da1a0d (diff) | |
| download | bootstrap-d2f1887bb5e7b651b11d6dd22ce191c733717a83.tar.xz bootstrap-d2f1887bb5e7b651b11d6dd22ce191c733717a83.zip | |
Merge branch 'master' into pr/12388
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'docs/_includes/header.html')
| -rw-r--r-- | docs/_includes/header.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/_includes/header.html b/docs/_includes/header.html index bc262e208..defb549ae 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -17,7 +17,7 @@ <link href="../dist/css/bootstrap.min.css" rel="stylesheet"> <!-- Documentation extras --> -<link href="../assets/css/pack.min.css" rel="stylesheet"> +<link href="../assets/css/docs.min.css" rel="stylesheet"> <!--[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 --> |