mastodon/app
Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
2022-11-06 09:50:41 +01:00
..
chewy Change algorithm of tootctl search deploy to improve performance (#18463) 2022-05-22 22:16:43 +02:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
mailers Add support for language preferences for trending statuses and links (#18288) 2022-10-08 16:45:40 +02:00
models Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
presenters Change sign-in banner to reflect disabled or moved account status (#19773) 2022-11-05 18:28:13 +01:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 18:15:28 +01:00
views Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00