Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop

2020-09-01 17:37:52 +01:00
parent b142d72e97 7c4a84aae0
commit 9df5371dca
90 changed files with 1476 additions and 914 deletions
--- a/package.json
+++ b/package.json
@@ -163,9 +163,7 @@
    "stylelint-config-standard": "^18.3.0",
    "stylelint-scss": "^3.18.0",
    "typescript": "^3.9.7",
-    "walk": "^2.3.14",
-    "webpack": "^4.43.0",
-    "webpack-cli": "^3.3.12"
+    "walk": "^2.3.14"
  },
  "jest": {
    "testMatch": [