mastodon/app/javascript/mastodon/features/compose
Claire c85c3fb708 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Upstream updated `jest`, moving its config in a separate file.
  This config was modified in glitch-soc, so the corresponding changes have
  been ported to `jest.config.js`
2022-05-04 19:15:50 +02:00
..
components Merge branch 'main' into glitch-soc/merge-upstream 2022-05-04 19:15:50 +02:00
containers Change "Direct" status visibility to "Only people I mention" in web UI (#18146) 2022-04-29 00:24:31 +02:00
util Update twitter-text from 1.14 to 3.1.0 and fix toot character counting (#15382) 2021-03-02 12:02:56 +01:00
index.js Change "Direct" status visibility to "Only people I mention" in web UI (#18146) 2022-04-29 00:24:31 +02:00