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

2019-11-21 11:15:32 +00:00
parent 6121420113 04641a0f87
commit d3f872bf7a
24 changed files with 262 additions and 107 deletions
@@ -133,6 +133,7 @@
    "eslint": "^5.12.0",
    "eslint-config-google": "^0.7.1",
    "eslint-plugin-babel": "^5.2.1",
+    "eslint-plugin-jest": "^23.0.4",
    "eslint-plugin-flowtype": "^2.30.0",
    "eslint-plugin-react": "^7.7.0",
    "eslint-plugin-react-hooks": "^2.0.1",