mastodon/app/helpers/admin
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
..
trends
account_moderation_notes_helper.rb
action_logs_helper.rb Fix admin action logs page (#19649) 2022-11-03 16:06:42 +01:00
announcements_helper.rb
dashboard_helper.rb
filter_helper.rb
settings_helper.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00