Claire 60abcb3c4c Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `config/i18n-tasks.yml`:
  Upstream added new ignored strings, glitch-soc has extra ignored strings
  because of the theming system.
  Added upstream's changes.

2023-01-18 17:38:11 +01:00

..

activitypub

…

admin

…

api

…

auth

…

concerns

…

disputes

…

oauth

…

settings

…

well_known

…

about_controller_spec.rb

…

accounts_controller_spec.rb

…

application_controller_spec.rb

…

authorize_interactions_controller_spec.rb

…

emojis_controller_spec.rb

…

follower_accounts_controller_spec.rb

…

following_accounts_controller_spec.rb

…

health_controller_spec.rb

…

home_controller_spec.rb

…

instance_actors_controller_spec.rb

…

intents_controller_spec.rb

…

invites_controller_spec.rb

…

manifests_controller_spec.rb

…

media_controller_spec.rb

…

media_proxy_controller_spec.rb

…

relationships_controller_spec.rb

…

shares_controller_spec.rb

…

statuses_cleanup_controller_spec.rb

…

statuses_controller_spec.rb

…

tags_controller_spec.rb

…