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 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.		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