aboutsummaryrefslogtreecommitdiff
path: root/_includes/header.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-14 16:56:56 -0800
committerMark Otto <[email protected]>2013-12-14 16:56:56 -0800
commit46c3d27468accdf98dd49257f17bdc507890a1c6 (patch)
tree9067b23767a152c8cb58f2a2d24bf1276e407e5b /_includes/header.html
parentaad447e29075b52a46931be17a9be4016cc89ef1 (diff)
parent4c64c1eecdb52d943a50d2c181aeb915a3caed34 (diff)
downloadbootstrap-46c3d27468accdf98dd49257f17bdc507890a1c6.tar.xz
bootstrap-46c3d27468accdf98dd49257f17bdc507890a1c6.zip
Merge branch 'master' into pr/11435
Conflicts: dist/css/bootstrap.css dist/css/bootstrap.min.css
Diffstat (limited to '_includes/header.html')
-rw-r--r--_includes/header.html5
1 files changed, 3 insertions, 2 deletions
diff --git a/_includes/header.html b/_includes/header.html
index 41ecfc8e4..18d7660b8 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 contributors">
<title>
{% if page.title == "Bootstrap" %}