Merge branch '2.3.0-wip' into 3.0.0-wip

Browse Source

Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/examples/hero.html
	less/buttons.less
	less/carousel.less
	less/close.less
	less/dropdowns.less
	less/labels-badges.less
	less/mixins.less
	less/navbar.less
	less/navs.less
	less/pagination.less
	less/responsive-navbar.less
	less/scaffolding.less
	less/sprites.less
	less/thumbnails.less
	less/type.less

...

This commit is contained in:

Mark Otto

2013-02-05 19:53:44 -08:00

parent e4a74607b0 c97d304c0c

commit 43da258bd9

16 changed files with 61 additions and 4724 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

4688

docs/assets/css/bootstrap.css vendored

File diff suppressed because it is too large Load Diff