1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-16 07:38:27 +09:00
YuruToot/app/javascript/mastodon/features/compose
Claire 60abcb3c4c Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `config/i18n-tasks.yml`:
  Upstream added new ignored strings, glitch-soc has extra ignored strings
  because of the theming system.
  Added upstream's changes.
2023-01-18 17:38:11 +01:00
..
components Merge branch 'main' into glitch-soc/merge-upstream 2023-01-18 17:38:11 +01:00
containers Don't autofocus the compose form (#16517) 2022-12-15 17:37:05 +01:00
util Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
index.js Don't autofocus the compose form (#16517) 2022-12-15 17:37:05 +01:00