Merge branch 'master' into sr-only-focusable

Browse Source

Conflicts:
	dist/css/bootstrap.css

...

This commit is contained in:

Mark Otto

2014-03-08 20:34:29 -08:00

parent dc5917bedf e4d13e238d

commit ef5d8e98e2

153 changed files with 13997 additions and 7183 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

File diff suppressed because one or more lines are too long