diff options
| author | Mark Otto <[email protected]> | 2013-12-15 14:09:50 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-15 14:09:50 -0800 |
| commit | 55f6beb4278979155549e17da6e87a2548ec0b88 (patch) | |
| tree | fde6fd0482a5f244433d280080b235a9d229c7e3 /_includes/header.html | |
| parent | 0c457d48f85ad637d9c47b5167b83e8de2b868d6 (diff) | |
| parent | 56eecf97ac21e5b6111563f726ad7860cd76f0f0 (diff) | |
| download | bootstrap-55f6beb4278979155549e17da6e87a2548ec0b88.tar.xz bootstrap-55f6beb4278979155549e17da6e87a2548ec0b88.zip | |
Merge branch 'master' into pr/11776
Conflicts:
package.json
Diffstat (limited to '_includes/header.html')
| -rw-r--r-- | _includes/header.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/_includes/header.html b/_includes/header.html index 93594b4bc..18d7660b8 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -3,7 +3,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0"> <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"> +<meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors"> <title> {% if page.title == "Bootstrap" %} |