Merge branch 'master' into pr/11817

Browse Source

Conflicts:
	dist/css/bootstrap.min.css
	less/input-groups.less

...

This commit is contained in:

Mark Otto

2013-12-15 15:07:38 -08:00

parent 3b5e0c9a3c b04a1de9b0

commit d1f15baa71

47 changed files with 1720 additions and 819 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