2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-30 15:24:08 +03:00

Merge branch 'master' of https://github.com/charnog/bootstrap into charnog-master

Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-08-23 23:40:12 -07:00
3 changed files with 5 additions and 1 deletions
+2
View File
@@ -58,6 +58,8 @@
> .disabled {
> span,
> span:hover,
> span:focus,
> a,
> a:hover,
> a:focus {