Merge branch 'master' into pr/12412

Browse Source

Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	test-infra/npm-shrinkwrap.canonical.json

...

This commit is contained in:

Mark Otto

2014-02-11 09:50:40 -08:00

parent b36d19c3c6 2cef0af211

commit 8551f42ae2

147 changed files with 3434 additions and 2541 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/dist/css/bootstrap-theme.css.map

Vendored

+1 -1

File diff suppressed because one or more lines are too long