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

Browse Source

Conflicts:
	docs/assets/css/docs.css
	docs/javascript.html
	docs/templates/pages/javascript.mustache

...

This commit is contained in:

Jacob Thornton

2012-07-24 00:24:25 -07:00

parent 4ea7c47235 7ce048bccd

commit 5b2f2ed821

25 changed files with 9447 additions and 9145 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/javascript.html

+1349 -1229

File diff suppressed because it is too large Load Diff