Merge branch 'master' into fix-12154

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:52:22 -08:00

parent 4787a69efb 7f88009394

commit e9199718d6

160 changed files with 13088 additions and 10844 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.min.css

Vendored

+2 -2

File diff suppressed because one or more lines are too long