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-02-26 23:15:36 -08:00

parent 6abb2059eb 74a3c763b4

commit ccf7697185

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.