Merge branch 'master' into 3.0.0-wip

Browse Source

Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/javascript.mustache
	less/breadcrumbs.less
	less/tables.less
	less/tests/css-tests.html

...

This commit is contained in:

Mark Otto

2012-12-08 17:40:42 -08:00

parent be5f31480b 9376a7c221

commit bc0b94a3fd

47 changed files with 693 additions and 112 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