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

Browse Source

Conflicts:
	dist/css/bootstrap.css.map
	docs/assets/js/customize.min.js
	docs/dist/css/bootstrap.css.map

...

This commit is contained in:

Mark Otto

2014-03-10 16:43:01 -07:00

parent a83ca38713 82e2f87363

commit 74c391b9ad

36 changed files with 1001 additions and 1097 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.css.map vendored

File diff suppressed because one or more lines are too long