Merge branch '2.2.2-wip' into 3.0.0-wip

Browse Source

Conflicts:
	README.md
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/examples/fluid.html
	docs/scaffolding.html
	less/breadcrumbs.less
	less/popovers.less
	less/responsive.less

...

This commit is contained in:

Mark Otto

2012-12-05 11:05:10 -08:00

parent b3019d7aab ed74992853

commit 33e14fe5bf

39 changed files with 279 additions and 354 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

docs/assets/js/bootstrap.min.js

Vendored

+1 -1

File diff suppressed because one or more lines are too long