You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 60abcb3c4c Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes.		2 years ago
..
about	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
appearance	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
branding	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
content_retention	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
discovery	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
other	Add back missing glitch-soc admin settings (#1919)	2 years ago
registrations	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
shared	Add back missing glitch-soc admin settings (#1919)	2 years ago