Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- README.md
  Kept our version
- app/javascript/mastodon/features/compose/components/compose_form.js
  Two changes too close to each other, took both changes

1 files changed, 4 insertions, 0 deletions

diff --git a/jest.config.js b/jest.config.js
index dc61b9a9d..ae6c96f33 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -23,4 +23,8 @@ module.exports = {
     '!app/javascript/mastodon/test_setup.js',
   ],
   coverageDirectory: '<rootDir>/coverage',
+  moduleDirectories: [
+    '<rootDir>/node_modules',
+    '<rootDir>/app/javascript',
+  ],
 };