Merge branch 'master' into derp

Browse source

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

...

This commit is contained in:

Mark Otto 2014-08-03 16:18:41 -07:00

parent de77d04899 6424acf69a

commit ae9c160932

9 changed files with 80 additions and 8 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

docs/assets/css/docs.min.css vendored

View file

File diff suppressed because one or more lines are too long