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

Browse Source

Conflicts:
	docs/assets/bootstrap.zip

...

This commit is contained in:

Jacob Thornton

2012-01-31 13:59:08 -08:00

parent 390a9af936 aec0cb3303

commit e75bc5eb5f

3 changed files with 2 additions and 2 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/bootstrap.zip

BIN

Binary file not shown.