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 c04f2d0cf7 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/settings/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc had a different lambda due to its theming system. Applied the same code style changes. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc removed some code just after the lambda. Applied the same code style changes.		1 year ago
..
about	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
appearance	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
branding	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
content_retention	Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream	1 year 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	1 year ago
shared	Add back missing glitch-soc admin settings (#1919)	2 years ago