Merge branch '2.3.0-wip' into 3.0.0-wip

Browse Source

Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	js/bootstrap-popover.js
	less/mixins.less
	less/tooltip.less

...

This commit is contained in:

Mark Otto

2013-02-05 22:42:54 -08:00

parent 6d21d86007 3b56227553

commit 421f9f67c4

19 changed files with 280 additions and 65 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

2

docs/assets/js/bootstrap.min.js vendored

File diff suppressed because one or more lines are too long