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

Browse Source

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2014-06-25 16:57:22 -07:00

parent e40df7cfac 4abb095783

commit 4045740c54

36 changed files with 3598 additions and 3661 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/dist/css/bootstrap.css.map

Vendored

+1 -1

File diff suppressed because one or more lines are too long