diff options
| author | Mark Otto <[email protected]> | 2014-02-11 09:50:40 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-11 09:50:40 -0800 |
| commit | 8551f42ae2935c96bd37ae8ed15198a0cc22ede2 (patch) | |
| tree | 77498aad62c25da55fb121470d91623c14873f58 /docs/_includes/header.html | |
| parent | b36d19c3c6caf89fbe996678bdefe3f7e9a69281 (diff) | |
| parent | 2cef0af211e8b6780fff90fe5f110493585aa97c (diff) | |
| download | bootstrap-8551f42ae2935c96bd37ae8ed15198a0cc22ede2.tar.xz bootstrap-8551f42ae2935c96bd37ae8ed15198a0cc22ede2.zip | |
Merge branch 'master' into pr/12412
Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
test-infra/npm-shrinkwrap.canonical.json
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 --> |