masto-fe/app/javascript/mastodon/features/compose
Claire ce12934f5b Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Upstream removed a dependency that was textually close to a glitch-soc-only
  dependency.
  Removed the dependency as upstream did, while keeping the glitch-soc-only
  dependency.
2023-04-09 11:45:08 +02:00
..
components Merge branch 'main' into glitch-soc/merge-upstream 2023-04-09 11:45:08 +02:00
containers Change search pop-out in web UI (#24305) 2023-04-01 09:59:10 +02:00
util Enable ESLint no-useless-escape (#23311) 2023-02-13 15:12:14 +01:00
index.jsx Remove legacy decorators syntax (#18357) 2023-03-24 03:17:53 +01:00