Merge branch 'master' into pr/12462

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 16:01:56 -08:00

parent 08ff305ed7 842af44fcc

commit e3cfd5821d

46 changed files with 677 additions and 461 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

docs/dist/css/bootstrap.css.map

Vendored

+1 -1

File diff suppressed because one or more lines are too long

docs/dist/css/bootstrap.min.css

Vendored

+1 -1

File diff suppressed because one or more lines are too long