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-05 22:30:54 -08:00

parent 4814281540 accfdaafdb

commit 3b56227553

11 changed files with 47 additions and 23 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/js/bootstrap.min.js

Vendored

+1 -1

File diff suppressed because one or more lines are too long