Merge branch 'master' into pr/13736

Browse Source

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

...

This commit is contained in:

Mark Otto

2014-06-08 13:57:44 -07:00

parent 5872a7e0ac 5cd72ce230

commit d1872b4c98

56 changed files with 535 additions and 345 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