mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-24 14:04:09 +03:00
Code Activity

Merge branch 'master' into docs-theme-toggler

Browse Source 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/css/docs.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2014-05-22 18:54:25 -07:00
parent 12b5d46f17 fab9ab8fe9
commit 326f6b2b87
27 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/_includes/header.html
+1 -1
View File
@@ -35,7 +35,7 @@
<!-- 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="shortcut icon" href="../assets/ico/favicon.ico">
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){