Merge branch 'master' into pr/15278

Browse source

Conflicts:
	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.css.map
	docs/dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto 2015-01-18 12:24:29 -08:00

parent dbe4765416 22b79dae3c

commit 1bf1ba7103

141 changed files with 1995 additions and 1604 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

View file

File diff suppressed because one or more lines are too long