catstodon/app/javascript/mastodon/features/compose
Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
  Port upstream's minor refactoring
2022-12-15 20:25:25 +01:00
..
components Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
containers Don't autofocus the compose form (#16517) 2022-12-15 17:37:05 +01: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 Don't autofocus the compose form (#16517) 2022-12-15 17:37:05 +01:00