diff options
| author | Mark Otto <[email protected]> | 2013-12-08 01:45:42 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-08 01:45:42 -0800 |
| commit | 12500047f984cbd921e810f7f9628556f49a282e (patch) | |
| tree | 2fed37f042f5438be98680b511a7b4c9f394ce3e /_includes/header.html | |
| parent | b92bee99efd95a4c0ae469e3a5f4004da0164578 (diff) | |
| parent | 475bbd4d3855231c47ece7ccd27c72030efb7d08 (diff) | |
| download | bootstrap-12500047f984cbd921e810f7f9628556f49a282e.tar.xz bootstrap-12500047f984cbd921e810f7f9628556f49a282e.zip | |
Merge branch 'master' into pr/11750
Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.min.css
Diffstat (limited to '_includes/header.html')
| -rw-r--r-- | _includes/header.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/_includes/header.html b/_includes/header.html index 41ecfc8e4..93594b4bc 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,8 +1,9 @@ <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> -<meta name="description" content=""> -<meta name="author" content=""> +<meta name="description" content="Bootstrap, a sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development."> +<meta name="keywords" content="HTML, CSS, JS, JavaScript, framework, bootstrap, front-end, frontend, web development"> +<meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contibutors"> <title> {% if page.title == "Bootstrap" %} |
