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 12:31:21 -07:00

parent 5d1707a25c c62426daeb

commit 37933a9e08

14 changed files with 41 additions and 51 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/css/bootstrap.min.css

Vendored

+1 -9

File diff suppressed because one or more lines are too long