5 Commits

Author	SHA1	Message	Date
Claire	d2f5feb25f	Fix linting issue	2026-03-02 18:59:32 +01:00
Claire	9f97df84da	Merge commit '45a996f12b04f88e0774bc6d6b52452ce39b612f' into glitch-soc/merge-upstream	2025-09-11 21:20:15 +02:00
diondiondion	872044484c	Update labels in Posting defaults settings (#36084)	2025-09-11 14:04:15 +00:00
Claire	d5b959a2ca	Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/other/show.html.haml`: Upstream moved some preferences to a new category, while glitch-soc had an extra preference there. Moved the extra preference like upstream did to the new category.	2025-09-02 19:07:51 +02:00
Claire	ab698ff521	Move posting defaults to their own preferences sub-category (#35966)	2025-09-01 08:31:07 +00:00