Claire 799bd69189 Merge commit '2f657019201d73c9d86d1ece339e66e72954f0eb' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
  Upstream refactored a line adjacent to a glitch-soc modified line.
  Ported upstream changes.

2026-03-02 12:19:02 +01:00

..

about

Mark Form::AdminSettings#persisted? as true (#35872)

2025-12-17 08:32:24 +00:00

appearance

Merge commit '009275e66b55729f754da7b4c814b37b67dc76dc' into glitch-soc/merge-upstream

2025-12-17 18:27:14 +01:00

branding

Use file_field support for array to accept attribute (#37844)

2026-03-02 09:27:04 +00:00

content_retention

Mark Form::AdminSettings#persisted? as true (#35872)

2025-12-17 08:32:24 +00:00

discovery

Merge commit '009275e66b55729f754da7b4c814b37b67dc76dc' into glitch-soc/merge-upstream

2025-12-17 18:27:14 +01:00

other

…

registrations

Mark Form::AdminSettings#persisted? as true (#35872)

2025-12-17 08:32:24 +00:00

shared

…