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

Browse Source

Conflicts:
	docs-assets/js/raw-files.js

...

This commit is contained in:

Mark Otto

2013-12-24 12:17:48 -08:00

parent 679c786237 25390716ea

commit 5c2dfbf33b

27 changed files with 36 additions and 30 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

dist/js/bootstrap.min.js vendored

File diff suppressed because one or more lines are too long