Merge branch 'master' into derp

Browse Source

Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	docs/_includes/components/progress-bars.html
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map

...

This commit is contained in:

Mark Otto

2014-07-11 00:38:28 -07:00

parent f6482aadcd c3ae289f4a

commit cabb86d126

11 changed files with 106 additions and 68 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

6

docs/assets/js/customize.min.js vendored

File diff suppressed because one or more lines are too long