Claire 85558a5e18 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Minor upstream change, our README is completely different. Kept ours. - `lib/tasks/assets.rake`: glitch-soc has extra code to deal with its theming system, upstream changed a line that exists in glitch-soc. Applied upstream changes.		2023-02-09 12:46:12 +01:00
..
about	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-09 12:46:12 +01:00
appearance	…
branding	…
content_retention	…
discovery	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +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