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.		2023-02-19 10:42:55 +01:00
..
custom_emoji_parser.rb	Add support for editing for published statuses (#16697)	2022-01-19 22:37:27 +01:00
media_attachment_parser.rb	Autofix Rubocop Style/IfUnlessModifier (#23697)	2023-02-18 12:37:47 +01:00
poll_parser.rb	Add support for editing for published statuses (#16697)	2022-01-19 22:37:27 +01:00
status_parser.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-19 23:52:48 +01:00