Merge branch 'master' into typography-example-updates

Conflicts: docs/assets/js/customize.min.js

Merge branch 'master' into typography-example-updates
Conflicts: docs/assets/js/customize.min.js
e25dacba · Mark Otto · d1d5d904 · ac4dd304 · e25dacba · e25dacba
Commit e25dacba authored Mar 07, 2014 by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

docs/assets/js/customize.min.js docs/assets/js/customize.min.js +1 -1

test-infra/npm-shrinkwrap.canonical.json test-infra/npm-shrinkwrap.canonical.json +1 -1

No files found.
--- a/docs/assets/js/customize.min.js
+++ b/docs/assets/js/customize.min.js
--- a/test-infra/npm-shrinkwrap.canonical.json
+++ b/test-infra/npm-shrinkwrap.canonical.json