2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00

Merge branch 'pullright' of https://github.com/liuyl/bootstrap into liuyl-pullright

Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-08-05 12:20:52 -07:00
6 changed files with 6 additions and 19 deletions
-1
View File
@@ -318,7 +318,6 @@
}
&.pull-right {
float: right;
width: auto;
}
}