Merge branch '3.0.0-wip' into bs3_alerts_default_class

Browse Source

Conflicts:
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-08-05 20:00:23 -07:00

parent 0faf42b4bc ac3cb6974a

commit 219f0fe7c5

13 changed files with 63 additions and 42 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