Merge branch 'master' into v3.3.0

Browse source

Conflicts:
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js

...

This commit is contained in:

Mark Otto 2014-10-29 11:56:48 -07:00

parent aa85e762ea 15d668dd15

commit 16dbdbd7a2

9 changed files with 67 additions and 7 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

docs/dist/css/bootstrap-theme.min.css vendored

View file

File diff suppressed because one or more lines are too long