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
..
trends	Autofix Rubocop Style/RedundantBegin (#23703)	2 years ago
account_moderation_notes_helper.rb	Add appeals (#17364)	3 years ago
action_logs_helper.rb	Fix moderation audit log items for warnings having incorrect links (#23242)	2 years ago
announcements_helper.rb	Add announcements (#12662)	5 years ago
dashboard_helper.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2 years ago
filter_helper.rb	Add trending statuses (#17431)	3 years ago
settings_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago