Merge branch 'master' of github.com:twitter/bootstrap

Browse Source

Conflicts:
	bootstrap-1.0.0.css
	bootstrap-1.0.0.min.css
	docs/index.html

...

This commit is contained in:

Jacob Thornton

2011-08-21 21:42:56 -07:00

parent b54dc13535 f169c99f72

commit e11c49cc48

7 changed files with 798 additions and 432 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/index.html

+672 -358

File diff suppressed because it is too large Load Diff