Merge branch 'master' into snyk-upgrade-ca3472799e93c0513444637b5066e4b0

d2s · Jan 10, 2020 · 2ee138b · 2ee138b
2 parents bfd7541 + 21e192d
commit 2ee138b
Show file tree

Hide file tree

Showing 2 changed files with 102 additions and 73 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,9 +36,9 @@
     "@commitlint/config-conventional": "^8.2.0",
     "commitizen": "^4.0.3",
     "cz-conventional-changelog": "^3.0.2",
-    "eslint-config-prettier": "6.3.0",
+    "eslint-config-prettier": "6.9.0",
     "husky": "^3.1.0",
-    "lint-staged": "^9.3.0",
+    "lint-staged": "^9.5.0",
     "micro-dev": "^3.0.0",
     "prettier": "1.18.2",
     "standard-version": "^7.0.0",