Merge branch 'master' into restore_grid_mixins

Browse Source

Conflicts:
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-10-13 18:32:34 -07:00

parent a46003b8c7 727a91de1c

commit 265fda7903

39 changed files with 356 additions and 332 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

+1 -1

File diff suppressed because one or more lines are too long