Merge branches 'develop' and 't3chguy/jest' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/jest

Conflicts: yarn.lock
2019-12-19 10:50:14 +00:00
parent b9e22f8141 f30e919f9e
commit affc8b8459
55 changed files with 2388 additions and 1709 deletions
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
    "file-saver": "^1.3.3",
    "filesize": "3.5.6",
    "flux": "2.1.1",
-    "focus-trap-react": "^3.0.5",
+    "react-focus-lock": "^2.2.1",
    "focus-visible": "^5.0.2",
    "fuse.js": "^2.2.0",
    "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566",