Claire ab59743c13 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/mailer.html.haml`: Upstream removed a line close to one modified by glitch-soc. Removed the line as upstream did.		2023-01-14 22:34:09 +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	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-14 22:34:09 +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