Merge branch 'master' into fix_15830

Browse Source

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

...

This commit is contained in:

Mark Otto

2015-04-04 23:52:40 -07:00

parent a2c69b8145 9c41aee780

commit 510f56f334

22 changed files with 394 additions and 118 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

1

dist/js/bootstrap.min.js vendored

File diff suppressed because one or more lines are too long