tootlab-mastodon/app/javascript/mastodon/features/compose
Claire 85558a5e18 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Minor upstream change, our README is completely different.
  Kept ours.
- `lib/tasks/assets.rake`:
  glitch-soc has extra code to deal with its theming system,
  upstream changed a line that exists in glitch-soc.
  Applied upstream changes.
2023-02-09 12:46:12 +01:00
..
components Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00
containers Add lang attribute to image description textarea and poll option field (#23293) 2023-01-29 19:00:19 +01:00
util Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
index.js Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00