Merge branch 'master' into v11/20px-unit-new-colors

Tradeshift · Oct 9, 2018 · bfa531b · bfa531b
2 parents fa15f3b + 04e6fbc
commit bfa531b
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 57 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -86,6 +86,7 @@
     "load-grunt-tasks": "^3.5.2",
     "node-static": "^0.7.10",
     "npm-run-all": "^4.1.1",
+    "octonode": "^0.9.4",
     "postcss-clean": "^1.0.2",
     "prettier": "1.7.0",
     "release-it": "7.6.1",