Thibaut Girka b9f351d845 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/javascript/mastodon/actions/compose.js`:
  Not a “real” conflict, but change too close to a change we made to
  fix the vanilla WebUI locally pushing authored local-only toots in the
  public TL view.

2020-07-22 13:38:17 +02:00

..

activitypub

…

admin

…

api

…

auth

…

concerns

…

oauth

…

settings

…

well_known

…

about_controller_spec.rb

…

account_follow_controller_spec.rb

…

account_unfollow_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_check_controller_spec.rb

…

home_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

…

remote_follow_controller_spec.rb

…

remote_interaction_controller_spec.rb

…

shares_controller_spec.rb

…

statuses_controller_spec.rb

…

tags_controller_spec.rb

…