Merge branch '2.3.0-wip' into 3.0.0-wip

Browse Source

Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/css.html
	docs/customize.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	less/navbar.less

...

This commit is contained in:

Mark Otto

2013-01-17 20:23:33 -08:00

parent f068cdeb63 01b465928e

commit d9b35c2602

27 changed files with 5491 additions and 20 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

2231

docs/base-css.html Normal file

File diff suppressed because it is too large Load Diff