2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00

Merge branch '2.2.2-wip' into exploratory

Conflicts:
	less/button-groups.less
This commit is contained in:
Mark Otto
2012-11-22 22:04:21 -08:00
17 changed files with 46 additions and 57 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
//
// Modals
// Reset CSS
// Adapted from http://github.com/necolas/normalize.css
// --------------------------------------------------