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 63992c6900 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
..
admin	Autofix Rubocop Style/IfUnlessModifier (#23697)	2 years ago
filters	Move V2 Filter methods under /api/v2 prefix (#20622)	2 years ago
filters_controller.rb	Revamp post filtering system (#18058)	2 years ago
instances_controller.rb	Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)	2 years ago
media_controller.rb	Change post-processing to be deferred only for large media types (#19617)	2 years ago
search_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
suggestions_controller.rb	Add cold-start follow recommendations (#15945)	4 years ago