Skip to content

Commit

Permalink
(less) Merge branch 'master' of https://github.com/charnog/bootstrap
Browse files Browse the repository at this point in the history
…into charnog-master

Conflicts:
	dist/css/bootstrap.min.css
  • Loading branch information
mdo committed Aug 24, 2013
2 parents a0787b9 + ed311da commit ff014ed
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions pagination.less
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@

> .disabled {
> span,
> span:hover,
> span:focus,
> a,
> a:hover,
> a:focus {
Expand Down

0 comments on commit ff014ed

Please sign in to comment.