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

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

Conflicts:
	docs/assets/bootstrap.zip
	less/mixins.less
This commit is contained in:
Jacob Thornton
2012-02-21 23:18:18 -08:00
14 changed files with 451 additions and 148 deletions
+1 -1
View File
@@ -589,4 +589,4 @@
}
}
}