Merge branch 'QA_5_0'

phpmyadmin · Aug 27, 2019 · 6e32245 · 6e32245
2 parents a04d280 + 1f63c3b
commit 6e32245
Show file tree

Hide file tree

Showing 2 changed files with 315 additions and 359 deletions.
diff --git a/package.json b/package.json
@@ -29,10 +29,7 @@
     "stylelint": "^10.1.0",
     "stylelint-config-recommended-scss": "^3.3.0",
     "stylelint-config-standard": "^18.3.0",
-    "stylelint-scss": "^3.9.1"
-  },
-  "resolutions": {
-    "lodash": "^4.17.13"
+    "stylelint-scss": "^3.10.0"
   },
   "scripts": {
     "postinstall": "yarn run --silent css-compile --quiet --style=compressed",