Claire 5fd8780b14 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `package.json`:
  Not really a conflict, upstream updated a dependency textually adjacent to a
  glitch-soc-only one.
  Updated the dependency as upstream did.

2022-05-11 09:37:48 +02:00

..

activitypub

…

admin

…

api

…

auth

…

concerns

…

disputes

…

oauth

…

settings

…

well_known

…

about_controller.rb

…

account_follow_controller.rb

…

account_unfollow_controller.rb

…

accounts_controller.rb

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

2022-05-11 09:37:48 +02:00

application_controller.rb

…

authorize_interactions_controller.rb

…

custom_css_controller.rb

…

directories_controller.rb

…

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

…

public_timelines_controller.rb

…

relationships_controller.rb

…

remote_follow_controller.rb

…

remote_interaction_controller.rb

…

shares_controller.rb

…

statuses_cleanup_controller.rb

…

statuses_controller.rb

…

tags_controller.rb

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

2022-05-11 09:37:48 +02:00