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

Browse Source

Conflicts:
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-09-11 16:35:27 -07:00

parent fddcadbc21 725e2b9ccf

commit d88e743b41

6 changed files with 50 additions and 29 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/css/bootstrap.min.css vendored

File diff suppressed because one or more lines are too long