Merge branch 'master' into pr/11648

Browse Source

Conflicts:
	dist/css/bootstrap.min.css
	less/grid.less

...

This commit is contained in:

Mark Otto

2013-11-30 13:09:55 -08:00

parent 702ad4c302 5611320101

commit 82bbccde9b

27 changed files with 447 additions and 425 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

6

dist/css/bootstrap.min.css vendored

File diff suppressed because one or more lines are too long