Merge branch 'master' into boulox-responsive-embed

Browse Source

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/css.html
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2014-03-06 22:40:25 -08:00

parent f4dd6221d4 7e299c6a49

commit 12c619f5b9

210 changed files with 22659 additions and 14561 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