Permalink
Browse files

Merge branch 'new_grid' into 2.0.2-wip

Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	less/mixins.less
  • Loading branch information...
2 parents 1562381 + 29c63fd commit 1a8d7576e091c06662ee94f84d0f3f88a2f2dad8 @fat fat committed Mar 10, 2012
Showing with 314 additions and 402 deletions.
  1. BIN docs/assets/bootstrap.zip
  2. +184 −232 docs/assets/css/bootstrap-responsive.css
  3. +93 −117 docs/assets/css/bootstrap.css
  4. +37 −53 less/mixins.less
View
Binary file not shown.
Oops, something went wrong.

0 comments on commit 1a8d757

Please sign in to comment.