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 0092fe50ac Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream entirely refactored this, while we changed the docker repository to upload to and disabled the “latest” tag. Applied the repository change to `.github/workflows/build-*.yml`, as well as disabling native ARMv64 builds. - `README.md`: We have a completely different README. Kept ours. - `app/views/admin/settings/shared/_links.html.haml`: Upstream refactored, we had an extra item. Refactored as upstream did. - `spec/controllers/api/v1/timelines/public_controller_spec.rb`: Upstream deleted this file, to be replaced by a request spec at `spec/requests/api/v1/timelines/public_spec.rb`. We had an extra bit about enabling the public timelines because we have different defaults than upstream. Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb`		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	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago