Merge branch 'pr/11778' into drop_recess_for_less

Browse Source

Conflicts:
	Gruntfile.js
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-12-08 23:48:07 -08:00

parent 0016c17f93 fdc5d1dc34

commit ea61a19a04

4 changed files with 27 additions and 37 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

9

dist/css/bootstrap-theme.min.css vendored

File diff suppressed because one or more lines are too long

9

dist/css/bootstrap.min.css vendored

File diff suppressed because one or more lines are too long