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:59:40 -07:00

parent 265fda7903 6351c30782

commit bf73f1f9d3

6 changed files with 30 additions and 29 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