diff options
| author | Mark Otto <[email protected]> | 2014-05-12 19:57:49 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-05-12 19:57:49 -0700 |
| commit | 31956be6ef6d1b1a2537c3441e69120ef3c99a2b (patch) | |
| tree | a118376f0f415826265828377904778f8e788b44 /docs/_includes/header.html | |
| parent | 510f4fe50ad30499adf1d19dd65ef694c414aacd (diff) | |
| parent | be18f50fd0e36e35342a100216b01fe00692d0db (diff) | |
| download | bootstrap-31956be6ef6d1b1a2537c3441e69120ef3c99a2b.tar.xz bootstrap-31956be6ef6d1b1a2537c3441e69120ef3c99a2b.zip | |
Merge branch 'master' into icon_paths
Conflicts:
dist/css/bootstrap-rtl.css
dist/css/bootstrap.css.map
dist/js/bootstrap.min.js
docs/dist/css/bootstrap.css.map
docs/dist/js/bootstrap.min.js
Diffstat (limited to 'docs/_includes/header.html')
| -rw-r--r-- | docs/_includes/header.html | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/docs/_includes/header.html b/docs/_includes/header.html index e12545ecc..182664d5a 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -25,21 +25,19 @@ <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> - <script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script> + <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <![endif]--> <!-- Favicons --> <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png"> - <link rel="icon" href="../assets/ico/favicon.ico"> +<link rel="icon" href="../assets/ico/favicon.ico"> <script> (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); - ga('create', 'UA-146052-10', 'getbootstrap.com'); ga('send', 'pageview'); - </script> |