Claire 32c70d2f09 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/announcements/edit.html.haml`: Upstream change too close to theming-related glitch-soc change. Ported upstream changes. - `app/views/admin/announcements/new.html.haml` Upstream change too close to theming-related glitch-soc change. Ported upstream changes.		2022-11-14 08:35:55 +01:00
..
about	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
appearance	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
branding	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
content_retention	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
discovery	Add “Glitch-only” label to glitch-specific settings	2022-11-12 11:30:35 +01:00
other	Add back missing glitch-soc admin settings (#1919)	2022-11-12 13:24:53 +01:00
registrations	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00
shared	Add back missing glitch-soc admin settings (#1919)	2022-11-12 13:24:53 +01:00