Merge branch 'master' into document_popover_focus

Browse Source

Conflicts:
	docs/assets/js/docs.min.js

...

This commit is contained in:

Mark Otto

2014-03-07 01:30:28 -08:00

parent 642fd51002 1f148427de

commit 0143e38a67

125 changed files with 12970 additions and 6441 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

dist/css/bootstrap.css.map vendored

File diff suppressed because one or more lines are too long