Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document

Browse Source

Conflicts:
	js/bootstrap-carousel.js

...

This commit is contained in:

Jacob Thornton

2012-10-17 23:05:16 -07:00

parent 280d4aeb30 e1f6458e36

commit 7f3b94c453

18 changed files with 130 additions and 181 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