Merge branch 'master' into pr/12813

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-22 12:20:53 -08:00

parent 49094844ac b99be29f32

commit 4ccf088a24

7 changed files with 18 additions and 11 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

dist/css/bootstrap.css.map

Vendored

+1 -1

File diff suppressed because one or more lines are too long