2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00

Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip

Conflicts:
	README.md
	bootstrap-1.2.0.css
This commit is contained in:
Jacob Thornton
2011-08-30 23:37:46 -07:00
4 changed files with 10 additions and 10 deletions
+1 -1
View File
@@ -107,4 +107,4 @@ a {
color: @linkColorHover;
text-decoration: underline;
}
}
}