Merge branch 'master' into input_sizing

Browse Source

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2015-03-28 20:31:53 -07:00

parent df8010b815 93bf800e1f

commit 57c8e3cd51

15 changed files with 363 additions and 59 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.css.map

Vendored

+1 -1

File diff suppressed because one or more lines are too long