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

Conflicts:
- `app/views/admin/reports/show.html.haml`:
  Conflicts due to glitch-soc's theming system.

2022-01-17 10:45:25 +01:00

..

activitypub

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

2022-01-17 08:28:52 +01:00

admin

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

2022-01-17 10:45:25 +01:00

api

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

2022-01-17 10:45:25 +01:00

auth

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

2022-01-16 18:11:20 +01:00

concerns

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

2022-01-16 18:11:20 +01:00

oauth

…

settings

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

2021-11-26 22:53:55 +01:00

well_known

Remove Keybase integration (#17045)

2021-11-26 05:58:18 +01:00

about_controller.rb

…

account_follow_controller.rb

…

account_unfollow_controller.rb

…

accounts_controller.rb

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

2022-01-17 08:28:52 +01: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

…