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

Merge branch 'main' into glitch-soc/merge-upstream

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

api

Merge branch 'main' into glitch-soc/merge-upstream

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

auth

…

concerns

Merge branch 'main' into glitch-soc/merge-upstream

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

disputes

…

filters

…

oauth

…

settings

…

well_known

…

about_controller.rb

…

accounts_controller.rb

…

application_controller.rb

…

authorize_interactions_controller.rb

…

custom_css_controller.rb

Add customizable user roles (#18641)

2022-07-05 02:41:40 +02:00

emojis_controller.rb

…

filters_controller.rb

…

follower_accounts_controller.rb

…

following_accounts_controller.rb

…

health_controller.rb

…

home_controller.rb

…

instance_actors_controller.rb

…

intents_controller.rb

…

invites_controller.rb

…

manifests_controller.rb

…

media_controller.rb

…

media_proxy_controller.rb

…

privacy_controller.rb

…

relationships_controller.rb

…

shares_controller.rb

…

statuses_cleanup_controller.rb

…

statuses_controller.rb

…

tags_controller.rb

…