2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00

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

Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-07-23 10:19:04 -07:00
4 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -379,7 +379,7 @@
@badge-color: #fff;
@badge-link-hover-color: #fff;
@badge-bg: #f5f5f5;
@badge-bg: @gray-light;
@badge-active-color: @link-color;
@badge-active-bg: #fff;