Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip

Browse Source

Conflicts:
	docs/assets/bootstrap.zip

...

This commit is contained in:

Mark Otto

2012-03-10 14:12:29 -08:00

parent dd5cffc308 a07851d6af

commit f7d4fb61ce

4 changed files with 772 additions and 594 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

docs/assets/css/bootstrap.css

Vendored

+461 -287

File diff suppressed because it is too large Load Diff