Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev

Browse Source

...

This commit is contained in:

Mark Otto

2015-11-29 19:54:20 -08:00

parent 765c5e9c07 c68019e5d0

commit 0fa2c7c486

31 changed files with 218 additions and 172 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

2

dist/css/bootstrap.css.map vendored

File diff suppressed because one or more lines are too long