Merge branch 'master' into pr/12639

Browse source

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto 2014-02-08 15:37:35 -08:00

parent a0052b5a37 91b76e5247

commit c8315edd73

21 changed files with 102 additions and 104 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