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 7452a95998 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.		2 years ago
..
account_relationships_presenter_spec.rb	Add follow request banner on account header (#20785)	2 years ago
familiar_followers_presenter_spec.rb	Add `/api/v1/accounts/familiar_followers` to REST API (#17700)	3 years ago
instance_presenter_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
status_relationships_presenter_spec.rb	Add ability to filter individual posts (#18945)	2 years ago