Merge branch 'master' into derp

Conflicts: docs/_layouts/default.html docs/assets/css/docs.min.css docs/assets/css/src/docs.css docs/assets/js/docs.min.js docs/assets/js/src/application.js

Merge branch 'master' into derp
Conflicts: docs/_layouts/default.html docs/assets/css/docs.min.css docs/assets/css/src/docs.css docs/assets/js/docs.min.js docs/assets/js/src/application.js
81b59d35 · Mark Otto · fed2b0f7 · ddee0403 · 81b59d35 · 81b59d35
Commit 81b59d35 authored 10 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 4121 additions and 94 deletions
+4121 -94
--- a/less/type.less
+++ b/less/type.less
--- a/less/utilities.less
+++ b/less/utilities.less
--- a/less/variables.less
+++ b/less/variables.less
--- a/package.json
+++ b/package.json
--- a/test-infra/README.md
+++ b/test-infra/README.md
--- a/test-infra/S3Cachefile.json
+++ b/test-infra/S3Cachefile.json
--- a/test-infra/npm-shrinkwrap.canonical.json
+++ b/test-infra/npm-shrinkwrap.canonical.json
--- a/test-infra/npm-shrinkwrap.json
+++ b/test-infra/npm-shrinkwrap.json
--- a/test-infra/s3_cache.py
+++ b/test-infra/s3_cache.py
--- a/test-infra/uncached-npm-install.sh
+++ b/test-infra/uncached-npm-install.sh