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

Browse Source

Conflicts:
	docs/assets/js/bootstrap.min.js

...

This commit is contained in:

fat

2013-02-07 19:47:01 -08:00

parent d8a7a380bc e3f3542d0b

commit 1bf070b4ce

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

2

docs/assets/js/bootstrap.min.js vendored

File diff suppressed because one or more lines are too long