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

Browse Source

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

...

This commit is contained in:

Mark Otto

2014-03-16 19:06:17 -07:00

parent 2a43e7e78a c6ab3fc7d8

commit b7ab799824

17 changed files with 95 additions and 25 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/css/docs.min.css

Vendored

+1 -1

File diff suppressed because one or more lines are too long

docs/assets/js/customize.min.js

Vendored

+1 -1

File diff suppressed because one or more lines are too long

docs/assets/js/raw-files.min.js

Vendored

+2 -2

File diff suppressed because one or more lines are too long

docs/dist/css/bootstrap-rtl.min.css

Vendored

+1 -1

File diff suppressed because one or more lines are too long

docs/dist/css/bootstrap.css.map

Vendored

+1 -1

File diff suppressed because one or more lines are too long

docs/dist/css/bootstrap.min.css

Vendored

+1 -1

File diff suppressed because one or more lines are too long

docs/dist/js/bootstrap.min.js

Vendored

+1 -1

File diff suppressed because one or more lines are too long