Merge branch 'master' of github.com:twbs/bootstrap

Browse Source

Conflicts:
	dist/js/bootstrap.min.js
	docs-assets/js/raw-files.js

...

This commit is contained in:

fat

2013-12-24 12:35:24 -08:00

parent 50bd4edb8c 1da3a8c6b1

commit 558b6a478d

49 changed files with 75 additions and 73 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

dist/js/bootstrap.min.js

Vendored

+2 -2

File diff suppressed because one or more lines are too long