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

Browse Source

Conflicts:
	dist/css/bootstrap.css.map

...

This commit is contained in:

Mark Otto

2014-12-22 19:30:51 -08:00

parent c41970c579 3668bde098

commit b615bd938b

9 changed files with 12 additions and 10 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-theme.css.map vendored

File diff suppressed because one or more lines are too long

2

dist/css/bootstrap.css.map vendored

File diff suppressed because one or more lines are too long