Merge branch '3.0.0-wip' into bs3_homepage

Browse Source

Conflicts:
	dist/css/bootstrap.min.css
	getting-started.html

...

This commit is contained in:

Mark Otto

2013-08-17 14:16:40 -07:00

parent ffbec23c98 1b814ddd0a

commit 441e04c84a

48 changed files with 565 additions and 487 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

dist/css/bootstrap.min.css

Vendored

+1 -1

File diff suppressed because one or more lines are too long