1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-22 13:13:03 +02: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

View File

@@ -589,4 +589,4 @@
}
}
}