Claire bd9e7d6060 Merge commit '68984de5b503791b814d81a85520af256bf43e11' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/admin/settings/discovery/show.html.haml`:
  Glitch-soc has an extra setting textually adjacent to a line upstream has changed.
  Applied upstream's change while keeping glitch-soc's setting.

2026-03-17 18:53:00 +01:00

..

about

Revamp heading levels in settings & admin pages (#38230)

2026-03-17 10:32:24 +00:00

appearance

Merge commit '68984de5b503791b814d81a85520af256bf43e11' into glitch-soc/merge-upstream

2026-03-17 18:53:00 +01:00

branding

Revamp heading levels in settings & admin pages (#38230)

2026-03-17 10:32:24 +00:00

content_retention

Revamp heading levels in settings & admin pages (#38230)

2026-03-17 10:32:24 +00:00

discovery

Merge commit '68984de5b503791b814d81a85520af256bf43e11' into glitch-soc/merge-upstream

2026-03-17 18:53:00 +01:00

other

…

registrations

Revamp heading levels in settings & admin pages (#38230)

2026-03-17 10:32:24 +00:00

shared

Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream

2024-08-08 19:30:16 +02:00