Merge branch '3.0.0-wip' into reset-FF-Android-default-background-image

Browse Source

Conflicts:
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-08-14 16:24:39 -07:00

parent 4d527ec316 8e8fe8de93

commit a9d6b7ee0b

5 changed files with 30 additions and 34 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.min.css vendored

File diff suppressed because one or more lines are too long