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

Browse Source

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

...

This commit is contained in:

Mark Otto

2014-12-10 20:51:17 -08:00

parent 2ade44a9ca 63d4423fc0

commit 0e371ddf87

11 changed files with 15 additions and 47 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