Merge branch 'master' of github.com:twitter/bootstrap into js-examples

Browse Source

Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
	lib/patterns.less
	lib/scaffolding.less

...

This commit is contained in:

Jacob Thornton

2011-09-02 21:04:25 -07:00

parent b4a84e1e7d 2589c0ac4e

commit 0e13f8dca1

15 changed files with 1050 additions and 693 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

bootstrap-1.2.0.css

Vendored

+2028

File diff suppressed because it is too large Load Diff