Claire e08c8b6933 Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/settings_helper.rb`:
  Upstream added a new helper.
  Conflict caused by the fact there is a glitch-soc specific helper.
  Added upstream's new helper in addition to glitch-soc's.

2026-06-09 21:30:54 +02:00

..

filter_serializer.rb

…

instance_serializer.rb

Merge commit '5b291fcbe41564264954618fb1f4086a3be1c600' into glitch-soc/merge-upstream

2025-01-28 18:29:46 +01:00

notification_policy_serializer.rb

Add policy to filter notifications from bots (#38494) (#38809)

2026-06-09 12:28:53 +00:00