Claire b3bae7e78f Merge commit '3473b8a65278783bc74ce2738aea98cca0c7a5ed' into glitch-soc/merge-upstream ...

Conflicts:
- `config/settings.yml`:
  Upstream added a new setting textually adjacent to ones modified by glitch-soc's.
  Added upstream's new setting.

2026-04-25 09:20:39 +02: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

Allow defining alt text for server thumbnail (#38796)

2026-04-23 17:46:50 +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

Add back missing glitch-soc admin settings (#1919)

2022-11-12 13:24:53 +01:00

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