Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

Browse Source

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

...

This commit is contained in:

Mark Otto

2015-05-27 15:49:55 -07:00

parent bd971c49b0 3fe894ba36

commit 663576a7ae

128 changed files with 24790 additions and 17469 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